{"action":"created","comment":{"url":"https://api.github.com/repos/openshift/openshift-docs/pulls/comments/61266750","id":61266750,"diff_hunk":"@@ -49,6 +51,23 @@ link:../../install_config/master_node_configuration.html#master-configuration-fi\n configuration file parameter `corsAllowedOrigins`].\n endif::[]\n \n+<<<<<<< HEAD\n+=======\n+ifdef::openshift-origin,openshift-online,openshift-enterprise,openshift-dedicated[]\n+[[web-console-cli-downloads]]\n+\n+== CLI Downloads\n+You can download and unpack the CLI from the\n+link:../install_config/web_console_customization.html#adding-or-changing-links-to-download-the-cli[*About*\n+page on the web console] for use on Linux, MacOSX, and Windows clients\n+ifdef::openshift-enterprise,openshift-origin[]\n+if your cluster administrator has enabled it\n+endif::[]\n+:\n+\n+image::about_page.png[\"About Page\"]\n+\n+>>>>>>> a2ab3c6... update for atomic registry use case","path":"architecture/infrastructure_components/web_console.adoc","position":34,"original_position":34,"commit_id":"0ad3735e28cde71b85dc3db527fc4946aa5e23fe","original_commit_id":"0ad3735e28cde71b85dc3db527fc4946aa5e23fe","user":{"login":"adellape","id":3442316,"avatar_url":"https://avatars.githubusercontent.com/u/3442316?v=3","gravatar_id":"","url":"https://api.github.com/users/adellape","html_url":"https://github.com/adellape","followers_url":"https://api.github.com/users/adellape/followers","following_url":"https://api.github.com/users/adellape/following{/other_user}","gists_url":"https://api.github.com/users/adellape/gists{/gist_id}","starred_url":"https://api.github.com/users/adellape/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/adellape/subscriptions","organizations_url":"https://api.github.com/users/adellape/orgs","repos_url":"https://api.github.com/users/adellape/repos","events_url":"https://api.github.com/users/adellape/events{/privacy}","received_events_url":"https://api.github.com/users/adellape/received_events","type":"User","site_admin":false},"body":"@vikram-redhat You've got merge conflict leftovers here.","created_at":"2016-04-27T14:29:01Z","updated_at":"2016-04-27T14:29:01Z","html_url":"https://github.com/openshift/openshift-docs/pull/1955#discussion_r61266750","pull_request_url":"https://api.github.com/repos/openshift/openshift-docs/pulls/1955","_links":{"self":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/comments/61266750"},"html":{"href":"https://github.com/openshift/openshift-docs/pull/1955#discussion_r61266750"},"pull_request":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/1955"}}},"pull_request":{"url":"https://api.github.com/repos/openshift/openshift-docs/pulls/1955","id":68000358,"html_url":"https://github.com/openshift/openshift-docs/pull/1955","diff_url":"https://github.com/openshift/openshift-docs/pull/1955.diff","patch_url":"https://github.com/openshift/openshift-docs/pull/1955.patch","issue_url":"https://api.github.com/repos/openshift/openshift-docs/issues/1955","number":1955,"state":"open","locked":false,"title":"Weekly Publishing 27.04.2016 - Online","user":{"login":"vikram-redhat","id":3347559,"avatar_url":"https://avatars.githubusercontent.com/u/3347559?v=3","gravatar_id":"","url":"https://api.github.com/users/vikram-redhat","html_url":"https://github.com/vikram-redhat","followers_url":"https://api.github.com/users/vikram-redhat/followers","following_url":"https://api.github.com/users/vikram-redhat/following{/other_user}","gists_url":"https://api.github.com/users/vikram-redhat/gists{/gist_id}","starred_url":"https://api.github.com/users/vikram-redhat/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vikram-redhat/subscriptions","organizations_url":"https://api.github.com/users/vikram-redhat/orgs","repos_url":"https://api.github.com/users/vikram-redhat/repos","events_url":"https://api.github.com/users/vikram-redhat/events{/privacy}","received_events_url":"https://api.github.com/users/vikram-redhat/received_events","type":"User","site_admin":false},"body":"","created_at":"2016-04-27T05:53:41Z","updated_at":"2016-04-27T14:29:01Z","closed_at":null,"merged_at":null,"merge_commit_sha":"cd10c1521644da8c6feace1eb465cd239b17e2ac","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/openshift/openshift-docs/pulls/1955/commits","review_comments_url":"https://api.github.com/repos/openshift/openshift-docs/pulls/1955/comments","review_comment_url":"https://api.github.com/repos/openshift/openshift-docs/pulls/comments{/number}","comments_url":"https://api.github.com/repos/openshift/openshift-docs/issues/1955/comments","statuses_url":"https://api.github.com/repos/openshift/openshift-docs/statuses/0ad3735e28cde71b85dc3db527fc4946aa5e23fe","head":{"label":"vikram-redhat:online","ref":"online","sha":"0ad3735e28cde71b85dc3db527fc4946aa5e23fe","user":{"login":"vikram-redhat","id":3347559,"avatar_url":"https://avatars.githubusercontent.com/u/3347559?v=3","gravatar_id":"","url":"https://api.github.com/users/vikram-redhat","html_url":"https://github.com/vikram-redhat","followers_url":"https://api.github.com/users/vikram-redhat/followers","following_url":"https://api.github.com/users/vikram-redhat/following{/other_user}","gists_url":"https://api.github.com/users/vikram-redhat/gists{/gist_id}","starred_url":"https://api.github.com/users/vikram-redhat/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vikram-redhat/subscriptions","organizations_url":"https://api.github.com/users/vikram-redhat/orgs","repos_url":"https://api.github.com/users/vikram-redhat/repos","events_url":"https://api.github.com/users/vikram-redhat/events{/privacy}","received_events_url":"https://api.github.com/users/vikram-redhat/received_events","type":"User","site_admin":false},"repo":{"id":57182752,"name":"openshift-docs","full_name":"vikram-redhat/openshift-docs","owner":{"login":"vikram-redhat","id":3347559,"avatar_url":"https://avatars.githubusercontent.com/u/3347559?v=3","gravatar_id":"","url":"https://api.github.com/users/vikram-redhat","html_url":"https://github.com/vikram-redhat","followers_url":"https://api.github.com/users/vikram-redhat/followers","following_url":"https://api.github.com/users/vikram-redhat/following{/other_user}","gists_url":"https://api.github.com/users/vikram-redhat/gists{/gist_id}","starred_url":"https://api.github.com/users/vikram-redhat/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/vikram-redhat/subscriptions","organizations_url":"https://api.github.com/users/vikram-redhat/orgs","repos_url":"https://api.github.com/users/vikram-redhat/repos","events_url":"https://api.github.com/users/vikram-redhat/events{/privacy}","received_events_url":"https://api.github.com/users/vikram-redhat/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/vikram-redhat/openshift-docs","description":"OpenShift Documentation","fork":true,"url":"https://api.github.com/repos/vikram-redhat/openshift-docs","forks_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/forks","keys_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/teams","hooks_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/hooks","issue_events_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/issues/events{/number}","events_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/events","assignees_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/assignees{/user}","branches_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/branches{/branch}","tags_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/tags","blobs_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/git/refs{/sha}","trees_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/statuses/{sha}","languages_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/languages","stargazers_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/stargazers","contributors_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/contributors","subscribers_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/subscribers","subscription_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/subscription","commits_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/commits{/sha}","git_commits_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/git/commits{/sha}","comments_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/comments{/number}","issue_comment_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/issues/comments{/number}","contents_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/contents/{+path}","compare_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/merges","archive_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/downloads","issues_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/issues{/number}","pulls_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/pulls{/number}","milestones_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/milestones{/number}","notifications_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/labels{/name}","releases_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/releases{/id}","deployments_url":"https://api.github.com/repos/vikram-redhat/openshift-docs/deployments","created_at":"2016-04-27T04:14:06Z","updated_at":"2016-04-27T04:14:08Z","pushed_at":"2016-04-27T05:52:02Z","git_url":"git://github.com/vikram-redhat/openshift-docs.git","ssh_url":"git@github.com:vikram-redhat/openshift-docs.git","clone_url":"https://github.com/vikram-redhat/openshift-docs.git","svn_url":"https://github.com/vikram-redhat/openshift-docs","homepage":"https://docs.openshift.org/latest/welcome/index.html","size":9821,"stargazers_count":0,"watchers_count":0,"language":"CSS","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"openshift:online","ref":"online","sha":"c89c0dce82a25c444f0b5ec3f886e8a52d90aa6c","user":{"login":"openshift","id":792337,"avatar_url":"https://avatars.githubusercontent.com/u/792337?v=3","gravatar_id":"","url":"https://api.github.com/users/openshift","html_url":"https://github.com/openshift","followers_url":"https://api.github.com/users/openshift/followers","following_url":"https://api.github.com/users/openshift/following{/other_user}","gists_url":"https://api.github.com/users/openshift/gists{/gist_id}","starred_url":"https://api.github.com/users/openshift/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openshift/subscriptions","organizations_url":"https://api.github.com/users/openshift/orgs","repos_url":"https://api.github.com/users/openshift/repos","events_url":"https://api.github.com/users/openshift/events{/privacy}","received_events_url":"https://api.github.com/users/openshift/received_events","type":"Organization","site_admin":false},"repo":{"id":21740844,"name":"openshift-docs","full_name":"openshift/openshift-docs","owner":{"login":"openshift","id":792337,"avatar_url":"https://avatars.githubusercontent.com/u/792337?v=3","gravatar_id":"","url":"https://api.github.com/users/openshift","html_url":"https://github.com/openshift","followers_url":"https://api.github.com/users/openshift/followers","following_url":"https://api.github.com/users/openshift/following{/other_user}","gists_url":"https://api.github.com/users/openshift/gists{/gist_id}","starred_url":"https://api.github.com/users/openshift/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openshift/subscriptions","organizations_url":"https://api.github.com/users/openshift/orgs","repos_url":"https://api.github.com/users/openshift/repos","events_url":"https://api.github.com/users/openshift/events{/privacy}","received_events_url":"https://api.github.com/users/openshift/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/openshift/openshift-docs","description":"OpenShift Documentation","fork":false,"url":"https://api.github.com/repos/openshift/openshift-docs","forks_url":"https://api.github.com/repos/openshift/openshift-docs/forks","keys_url":"https://api.github.com/repos/openshift/openshift-docs/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openshift/openshift-docs/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openshift/openshift-docs/teams","hooks_url":"https://api.github.com/repos/openshift/openshift-docs/hooks","issue_events_url":"https://api.github.com/repos/openshift/openshift-docs/issues/events{/number}","events_url":"https://api.github.com/repos/openshift/openshift-docs/events","assignees_url":"https://api.github.com/repos/openshift/openshift-docs/assignees{/user}","branches_url":"https://api.github.com/repos/openshift/openshift-docs/branches{/branch}","tags_url":"https://api.github.com/repos/openshift/openshift-docs/tags","blobs_url":"https://api.github.com/repos/openshift/openshift-docs/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openshift/openshift-docs/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openshift/openshift-docs/git/refs{/sha}","trees_url":"https://api.github.com/repos/openshift/openshift-docs/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openshift/openshift-docs/statuses/{sha}","languages_url":"https://api.github.com/repos/openshift/openshift-docs/languages","stargazers_url":"https://api.github.com/repos/openshift/openshift-docs/stargazers","contributors_url":"https://api.github.com/repos/openshift/openshift-docs/contributors","subscribers_url":"https://api.github.com/repos/openshift/openshift-docs/subscribers","subscription_url":"https://api.github.com/repos/openshift/openshift-docs/subscription","commits_url":"https://api.github.com/repos/openshift/openshift-docs/commits{/sha}","git_commits_url":"https://api.github.com/repos/openshift/openshift-docs/git/commits{/sha}","comments_url":"https://api.github.com/repos/openshift/openshift-docs/comments{/number}","issue_comment_url":"https://api.github.com/repos/openshift/openshift-docs/issues/comments{/number}","contents_url":"https://api.github.com/repos/openshift/openshift-docs/contents/{+path}","compare_url":"https://api.github.com/repos/openshift/openshift-docs/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openshift/openshift-docs/merges","archive_url":"https://api.github.com/repos/openshift/openshift-docs/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openshift/openshift-docs/downloads","issues_url":"https://api.github.com/repos/openshift/openshift-docs/issues{/number}","pulls_url":"https://api.github.com/repos/openshift/openshift-docs/pulls{/number}","milestones_url":"https://api.github.com/repos/openshift/openshift-docs/milestones{/number}","notifications_url":"https://api.github.com/repos/openshift/openshift-docs/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openshift/openshift-docs/labels{/name}","releases_url":"https://api.github.com/repos/openshift/openshift-docs/releases{/id}","deployments_url":"https://api.github.com/repos/openshift/openshift-docs/deployments","created_at":"2014-07-11T15:14:42Z","updated_at":"2016-04-04T03:57:52Z","pushed_at":"2016-04-27T13:44:38Z","git_url":"git://github.com/openshift/openshift-docs.git","ssh_url":"git@github.com:openshift/openshift-docs.git","clone_url":"https://github.com/openshift/openshift-docs.git","svn_url":"https://github.com/openshift/openshift-docs","homepage":"https://docs.openshift.org/latest/welcome/index.html","size":13481,"stargazers_count":42,"watchers_count":42,"language":"CSS","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":200,"mirror_url":null,"open_issues_count":168,"forks":200,"open_issues":168,"watchers":42,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/1955"},"html":{"href":"https://github.com/openshift/openshift-docs/pull/1955"},"issue":{"href":"https://api.github.com/repos/openshift/openshift-docs/issues/1955"},"comments":{"href":"https://api.github.com/repos/openshift/openshift-docs/issues/1955/comments"},"review_comments":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/1955/comments"},"review_comment":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/openshift/openshift-docs/pulls/1955/commits"},"statuses":{"href":"https://api.github.com/repos/openshift/openshift-docs/statuses/0ad3735e28cde71b85dc3db527fc4946aa5e23fe"}}}}