GitHub PullRequestReviewCommentEvent at 2014-09-01 21:09:54
Repository: marathon
Actor: mlunoe
Payload: {"action":"created","comment":{"url":"https://api.github.com/repos/mesosphere/marathon/pulls/comments/16964607","id":16964607,"diff_hunk":"@@ -128,11 +134,20 @@ define([\n       return (\n         <table className={tableClassName}>\n           <colgroup>\n+<<<<<<< HEAD\n+            <col style={{width: \"30%\"}} />\n+            <col style={{width: \"18%\"}} />\n+            <col style={{width: \"18%\"}} />\n+            <col style={{width: \"18%\"}} />\n+            <col style={{width: \"18%\"}} />\n+=======\n             <col style={{width: \"25%\"}} />\n-            <col style={{width: \"35%\"}} />\n-            <col style={{width: \"14%\"}} />\n+            <col style={{width: \"28%\"}} />\n+            <col style={{width: \"10%\"}} />\n+            <col style={{width: \"10%\"}} />\n             <col style={{width: \"13%\"}} />\n             <col style={{width: \"13%\"}} />\n+>>>>>>> Adding deployments to modal and app list","path":"src/main/resources/assets/js/components/AppListComponent.jsx","position":66,"original_position":66,"commit_id":"d802ae3b9e01449c62ca6499d0e4532ac9c146a1","original_commit_id":"d802ae3b9e01449c62ca6499d0e4532ac9c146a1","user":{"login":"mlunoe","id":1097941,"avatar_url":"https://avatars.githubusercontent.com/u/1097941?v=2","gravatar_id":"c283ae0b4a40257228d28aae9d1d0534","url":"https://api.github.com/users/mlunoe","html_url":"https://github.com/mlunoe","followers_url":"https://api.github.com/users/mlunoe/followers","following_url":"https://api.github.com/users/mlunoe/following{/other_user}","gists_url":"https://api.github.com/users/mlunoe/gists{/gist_id}","starred_url":"https://api.github.com/users/mlunoe/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mlunoe/subscriptions","organizations_url":"https://api.github.com/users/mlunoe/orgs","repos_url":"https://api.github.com/users/mlunoe/repos","events_url":"https://api.github.com/users/mlunoe/events{/privacy}","received_events_url":"https://api.github.com/users/mlunoe/received_events","type":"User","site_admin":false},"body":"Dang! Will look at it ASAP","created_at":"2014-09-01T21:09:54Z","updated_at":"2014-09-01T21:09:54Z","html_url":"https://github.com/mesosphere/marathon/pull/518#discussion_r16964607","pull_request_url":"https://api.github.com/repos/mesosphere/marathon/pulls/518","_links":{"self":{"href":"https://api.github.com/repos/mesosphere/marathon/pulls/comments/16964607"},"html":{"href":"https://github.com/mesosphere/marathon/pull/518#discussion_r16964607"},"pull_request":{"href":"https://api.github.com/repos/mesosphere/marathon/pulls/518"}}},"pull_request":{"url":"https://api.github.com/repos/mesosphere/marathon/pulls/518","id":20486643,"html_url":"https://github.com/mesosphere/marathon/pull/518","diff_url":"https://github.com/mesosphere/marathon/pull/518.diff","patch_url":"https://github.com/mesosphere/marathon/pull/518.patch","issue_url":"https://api.github.com/repos/mesosphere/marathon/issues/518","number":518,"state":"open","locked":false,"title":"Added related deployments to GET /v2/apps","user":{"login":"ConnorDoyle","id":379372,"avatar_url":"https://avatars.githubusercontent.com/u/379372?v=2","gravatar_id":"4880df3637aecd0e4bdaad5a6aabd56b","url":"https://api.github.com/users/ConnorDoyle","html_url":"https://github.com/ConnorDoyle","followers_url":"https://api.github.com/users/ConnorDoyle/followers","following_url":"https://api.github.com/users/ConnorDoyle/following{/other_user}","gists_url":"https://api.github.com/users/ConnorDoyle/gists{/gist_id}","starred_url":"https://api.github.com/users/ConnorDoyle/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ConnorDoyle/subscriptions","organizations_url":"https://api.github.com/users/ConnorDoyle/orgs","repos_url":"https://api.github.com/users/ConnorDoyle/repos","events_url":"https://api.github.com/users/ConnorDoyle/events{/privacy}","received_events_url":"https://api.github.com/users/ConnorDoyle/received_events","type":"User","site_admin":false},"body":"- includes REST doc updates\r\n- fixes #516 \r\n\r\n@mlunoe @ssorallen ","created_at":"2014-08-29T08:10:45Z","updated_at":"2014-09-01T21:09:54Z","closed_at":null,"merged_at":null,"merge_commit_sha":"dd9c92c756f26ac750aa35a780fa820c40c59fba","assignee":{"login":"mlunoe","id":1097941,"avatar_url":"https://avatars.githubusercontent.com/u/1097941?v=2","gravatar_id":"c283ae0b4a40257228d28aae9d1d0534","url":"https://api.github.com/users/mlunoe","html_url":"https://github.com/mlunoe","followers_url":"https://api.github.com/users/mlunoe/followers","following_url":"https://api.github.com/users/mlunoe/following{/other_user}","gists_url":"https://api.github.com/users/mlunoe/gists{/gist_id}","starred_url":"https://api.github.com/users/mlunoe/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mlunoe/subscriptions","organizations_url":"https://api.github.com/users/mlunoe/orgs","repos_url":"https://api.github.com/users/mlunoe/repos","events_url":"https://api.github.com/users/mlunoe/events{/privacy}","received_events_url":"https://api.github.com/users/mlunoe/received_events","type":"User","site_admin":false},"milestone":{"url":"https://api.github.com/repos/mesosphere/marathon/milestones/6","labels_url":"https://api.github.com/repos/mesosphere/marathon/milestones/6/labels","id":702642,"number":6,"title":"0.7.0","description":"","creator":{"login":"guenter","id":53613,"avatar_url":"https://avatars.githubusercontent.com/u/53613?v=2","gravatar_id":"cb4a9c6ac5624ebb76686f4a1dc0ea9c","url":"https://api.github.com/users/guenter","html_url":"https://github.com/guenter","followers_url":"https://api.github.com/users/guenter/followers","following_url":"https://api.github.com/users/guenter/following{/other_user}","gists_url":"https://api.github.com/users/guenter/gists{/gist_id}","starred_url":"https://api.github.com/users/guenter/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/guenter/subscriptions","organizations_url":"https://api.github.com/users/guenter/orgs","repos_url":"https://api.github.com/users/guenter/repos","events_url":"https://api.github.com/users/guenter/events{/privacy}","received_events_url":"https://api.github.com/users/guenter/received_events","type":"User","site_admin":false},"open_issues":7,"closed_issues":50,"state":"open","created_at":"2014-06-26T16:33:58Z","updated_at":"2014-09-01T11:08:06Z","due_on":"2014-08-18T07:00:00Z"},"commits_url":"https://api.github.com/repos/mesosphere/marathon/pulls/518/commits","review_comments_url":"https://api.github.com/repos/mesosphere/marathon/pulls/518/comments","review_comment_url":"https://api.github.com/repos/mesosphere/marathon/pulls/comments/{number}","comments_url":"https://api.github.com/repos/mesosphere/marathon/issues/518/comments","statuses_url":"https://api.github.com/repos/mesosphere/marathon/statuses/d802ae3b9e01449c62ca6499d0e4532ac9c146a1","head":{"label":"mesosphere:deployments-in-apps-collection","ref":"deployments-in-apps-collection","sha":"d802ae3b9e01449c62ca6499d0e4532ac9c146a1","user":{"login":"mesosphere","id":3458585,"avatar_url":"https://avatars.githubusercontent.com/u/3458585?v=2","gravatar_id":"be27c1b4d910ac509bddfc1e41714f6a","url":"https://api.github.com/users/mesosphere","html_url":"https://github.com/mesosphere","followers_url":"https://api.github.com/users/mesosphere/followers","following_url":"https://api.github.com/users/mesosphere/following{/other_user}","gists_url":"https://api.github.com/users/mesosphere/gists{/gist_id}","starred_url":"https://api.github.com/users/mesosphere/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mesosphere/subscriptions","organizations_url":"https://api.github.com/users/mesosphere/orgs","repos_url":"https://api.github.com/users/mesosphere/repos","events_url":"https://api.github.com/users/mesosphere/events{/privacy}","received_events_url":"https://api.github.com/users/mesosphere/received_events","type":"Organization","site_admin":false},"repo":{"id":10941409,"name":"marathon","full_name":"mesosphere/marathon","owner":{"login":"mesosphere","id":3458585,"avatar_url":"https://avatars.githubusercontent.com/u/3458585?v=2","gravatar_id":"be27c1b4d910ac509bddfc1e41714f6a","url":"https://api.github.com/users/mesosphere","html_url":"https://github.com/mesosphere","followers_url":"https://api.github.com/users/mesosphere/followers","following_url":"https://api.github.com/users/mesosphere/following{/other_user}","gists_url":"https://api.github.com/users/mesosphere/gists{/gist_id}","starred_url":"https://api.github.com/users/mesosphere/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mesosphere/subscriptions","organizations_url":"https://api.github.com/users/mesosphere/orgs","repos_url":"https://api.github.com/users/mesosphere/repos","events_url":"https://api.github.com/users/mesosphere/events{/privacy}","received_events_url":"https://api.github.com/users/mesosphere/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mesosphere/marathon","description":"Cluster-wide init and control system (or PaaS layer) for services in cgroups or Docker containers based on Apache Mesos.","fork":false,"url":"https://api.github.com/repos/mesosphere/marathon","forks_url":"https://api.github.com/repos/mesosphere/marathon/forks","keys_url":"https://api.github.com/repos/mesosphere/marathon/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mesosphere/marathon/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mesosphere/marathon/teams","hooks_url":"https://api.github.com/repos/mesosphere/marathon/hooks","issue_events_url":"https://api.github.com/repos/mesosphere/marathon/issues/events{/number}","events_url":"https://api.github.com/repos/mesosphere/marathon/events","assignees_url":"https://api.github.com/repos/mesosphere/marathon/assignees{/user}","branches_url":"https://api.github.com/repos/mesosphere/marathon/branches{/branch}","tags_url":"https://api.github.com/repos/mesosphere/marathon/tags","blobs_url":"https://api.github.com/repos/mesosphere/marathon/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mesosphere/marathon/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mesosphere/marathon/git/refs{/sha}","trees_url":"https://api.github.com/repos/mesosphere/marathon/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mesosphere/marathon/statuses/{sha}","languages_url":"https://api.github.com/repos/mesosphere/marathon/languages","stargazers_url":"https://api.github.com/repos/mesosphere/marathon/stargazers","contributors_url":"https://api.github.com/repos/mesosphere/marathon/contributors","subscribers_url":"https://api.github.com/repos/mesosphere/marathon/subscribers","subscription_url":"https://api.github.com/repos/mesosphere/marathon/subscription","commits_url":"https://api.github.com/repos/mesosphere/marathon/commits{/sha}","git_commits_url":"https://api.github.com/repos/mesosphere/marathon/git/commits{/sha}","comments_url":"https://api.github.com/repos/mesosphere/marathon/comments{/number}","issue_comment_url":"https://api.github.com/repos/mesosphere/marathon/issues/comments/{number}","contents_url":"https://api.github.com/repos/mesosphere/marathon/contents/{+path}","compare_url":"https://api.github.com/repos/mesosphere/marathon/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mesosphere/marathon/merges","archive_url":"https://api.github.com/repos/mesosphere/marathon/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mesosphere/marathon/downloads","issues_url":"https://api.github.com/repos/mesosphere/marathon/issues{/number}","pulls_url":"https://api.github.com/repos/mesosphere/marathon/pulls{/number}","milestones_url":"https://api.github.com/repos/mesosphere/marathon/milestones{/number}","notifications_url":"https://api.github.com/repos/mesosphere/marathon/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mesosphere/marathon/labels{/name}","releases_url":"https://api.github.com/repos/mesosphere/marathon/releases{/id}","created_at":"2013-06-25T14:56:34Z","updated_at":"2014-09-01T19:27:17Z","pushed_at":"2014-08-29T23:32:55Z","git_url":"git://github.com/mesosphere/marathon.git","ssh_url":"git@github.com:mesosphere/marathon.git","clone_url":"https://github.com/mesosphere/marathon.git","svn_url":"https://github.com/mesosphere/marathon","homepage":"https://mesosphere.github.io/marathon/","size":22561,"stargazers_count":668,"watchers_count":668,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":126,"mirror_url":null,"open_issues_count":56,"forks":126,"open_issues":56,"watchers":668,"default_branch":"master"}},"base":{"label":"mesosphere:master","ref":"master","sha":"4289c0cb4230acd76c7691a7738dd6baadc0c0f2","user":{"login":"mesosphere","id":3458585,"avatar_url":"https://avatars.githubusercontent.com/u/3458585?v=2","gravatar_id":"be27c1b4d910ac509bddfc1e41714f6a","url":"https://api.github.com/users/mesosphere","html_url":"https://github.com/mesosphere","followers_url":"https://api.github.com/users/mesosphere/followers","following_url":"https://api.github.com/users/mesosphere/following{/other_user}","gists_url":"https://api.github.com/users/mesosphere/gists{/gist_id}","starred_url":"https://api.github.com/users/mesosphere/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mesosphere/subscriptions","organizations_url":"https://api.github.com/users/mesosphere/orgs","repos_url":"https://api.github.com/users/mesosphere/repos","events_url":"https://api.github.com/users/mesosphere/events{/privacy}","received_events_url":"https://api.github.com/users/mesosphere/received_events","type":"Organization","site_admin":false},"repo":{"id":10941409,"name":"marathon","full_name":"mesosphere/marathon","owner":{"login":"mesosphere","id":3458585,"avatar_url":"https://avatars.githubusercontent.com/u/3458585?v=2","gravatar_id":"be27c1b4d910ac509bddfc1e41714f6a","url":"https://api.github.com/users/mesosphere","html_url":"https://github.com/mesosphere","followers_url":"https://api.github.com/users/mesosphere/followers","following_url":"https://api.github.com/users/mesosphere/following{/other_user}","gists_url":"https://api.github.com/users/mesosphere/gists{/gist_id}","starred_url":"https://api.github.com/users/mesosphere/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/mesosphere/subscriptions","organizations_url":"https://api.github.com/users/mesosphere/orgs","repos_url":"https://api.github.com/users/mesosphere/repos","events_url":"https://api.github.com/users/mesosphere/events{/privacy}","received_events_url":"https://api.github.com/users/mesosphere/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/mesosphere/marathon","description":"Cluster-wide init and control system (or PaaS layer) for services in cgroups or Docker containers based on Apache Mesos.","fork":false,"url":"https://api.github.com/repos/mesosphere/marathon","forks_url":"https://api.github.com/repos/mesosphere/marathon/forks","keys_url":"https://api.github.com/repos/mesosphere/marathon/keys{/key_id}","collaborators_url":"https://api.github.com/repos/mesosphere/marathon/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/mesosphere/marathon/teams","hooks_url":"https://api.github.com/repos/mesosphere/marathon/hooks","issue_events_url":"https://api.github.com/repos/mesosphere/marathon/issues/events{/number}","events_url":"https://api.github.com/repos/mesosphere/marathon/events","assignees_url":"https://api.github.com/repos/mesosphere/marathon/assignees{/user}","branches_url":"https://api.github.com/repos/mesosphere/marathon/branches{/branch}","tags_url":"https://api.github.com/repos/mesosphere/marathon/tags","blobs_url":"https://api.github.com/repos/mesosphere/marathon/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/mesosphere/marathon/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/mesosphere/marathon/git/refs{/sha}","trees_url":"https://api.github.com/repos/mesosphere/marathon/git/trees{/sha}","statuses_url":"https://api.github.com/repos/mesosphere/marathon/statuses/{sha}","languages_url":"https://api.github.com/repos/mesosphere/marathon/languages","stargazers_url":"https://api.github.com/repos/mesosphere/marathon/stargazers","contributors_url":"https://api.github.com/repos/mesosphere/marathon/contributors","subscribers_url":"https://api.github.com/repos/mesosphere/marathon/subscribers","subscription_url":"https://api.github.com/repos/mesosphere/marathon/subscription","commits_url":"https://api.github.com/repos/mesosphere/marathon/commits{/sha}","git_commits_url":"https://api.github.com/repos/mesosphere/marathon/git/commits{/sha}","comments_url":"https://api.github.com/repos/mesosphere/marathon/comments{/number}","issue_comment_url":"https://api.github.com/repos/mesosphere/marathon/issues/comments/{number}","contents_url":"https://api.github.com/repos/mesosphere/marathon/contents/{+path}","compare_url":"https://api.github.com/repos/mesosphere/marathon/compare/{base}...{head}","merges_url":"https://api.github.com/repos/mesosphere/marathon/merges","archive_url":"https://api.github.com/repos/mesosphere/marathon/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/mesosphere/marathon/downloads","issues_url":"https://api.github.com/repos/mesosphere/marathon/issues{/number}","pulls_url":"https://api.github.com/repos/mesosphere/marathon/pulls{/number}","milestones_url":"https://api.github.com/repos/mesosphere/marathon/milestones{/number}","notifications_url":"https://api.github.com/repos/mesosphere/marathon/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/mesosphere/marathon/labels{/name}","releases_url":"https://api.github.com/repos/mesosphere/marathon/releases{/id}","created_at":"2013-06-25T14:56:34Z","updated_at":"2014-09-01T19:27:17Z","pushed_at":"2014-08-29T23:32:55Z","git_url":"git://github.com/mesosphere/marathon.git","ssh_url":"git@github.com:mesosphere/marathon.git","clone_url":"https://github.com/mesosphere/marathon.git","svn_url":"https://github.com/mesosphere/marathon","homepage":"https://mesosphere.github.io/marathon/","size":22561,"stargazers_count":668,"watchers_count":668,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"forks_count":126,"mirror_url":null,"open_issues_count":56,"forks":126,"open_issues":56,"watchers":668,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/mesosphere/marathon/pulls/518"},"html":{"href":"https://github.com/mesosphere/marathon/pull/518"},"issue":{"href":"https://api.github.com/repos/mesosphere/marathon/issues/518"},"comments":{"href":"https://api.github.com/repos/mesosphere/marathon/issues/518/comments"},"review_comments":{"href":"https://api.github.com/repos/mesosphere/marathon/pulls/518/comments"},"review_comment":{"href":"https://api.github.com/repos/mesosphere/marathon/pulls/comments/{number}"},"commits":{"href":"https://api.github.com/repos/mesosphere/marathon/pulls/518/commits"},"statuses":{"href":"https://api.github.com/repos/mesosphere/marathon/statuses/d802ae3b9e01449c62ca6499d0e4532ac9c146a1"}}}}