{"action":"closed","issue":{"url":"https://api.github.com/repos/catapult-project/catapult/issues/2518","repository_url":"https://api.github.com/repos/catapult-project/catapult","labels_url":"https://api.github.com/repos/catapult-project/catapult/issues/2518/labels{/name}","comments_url":"https://api.github.com/repos/catapult-project/catapult/issues/2518/comments","events_url":"https://api.github.com/repos/catapult-project/catapult/issues/2518/events","html_url":"https://github.com/catapult-project/catapult/issues/2518","id":166747981,"number":2518,"title":"Merge Polymer10-migration branch ","user":{"login":"Apeliotes","id":7633415,"avatar_url":"https://avatars.githubusercontent.com/u/7633415?v=3","gravatar_id":"","url":"https://api.github.com/users/Apeliotes","html_url":"https://github.com/Apeliotes","followers_url":"https://api.github.com/users/Apeliotes/followers","following_url":"https://api.github.com/users/Apeliotes/following{/other_user}","gists_url":"https://api.github.com/users/Apeliotes/gists{/gist_id}","starred_url":"https://api.github.com/users/Apeliotes/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Apeliotes/subscriptions","organizations_url":"https://api.github.com/users/Apeliotes/orgs","repos_url":"https://api.github.com/users/Apeliotes/repos","events_url":"https://api.github.com/users/Apeliotes/events{/privacy}","received_events_url":"https://api.github.com/users/Apeliotes/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/catapult-project/catapult/labels/Polymer%201.0%20Migration","name":"Polymer 1.0 Migration","color":"006b75"}],"state":"closed","locked":false,"assignee":{"login":"zeptonaut","id":1407397,"avatar_url":"https://avatars.githubusercontent.com/u/1407397?v=3","gravatar_id":"","url":"https://api.github.com/users/zeptonaut","html_url":"https://github.com/zeptonaut","followers_url":"https://api.github.com/users/zeptonaut/followers","following_url":"https://api.github.com/users/zeptonaut/following{/other_user}","gists_url":"https://api.github.com/users/zeptonaut/gists{/gist_id}","starred_url":"https://api.github.com/users/zeptonaut/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zeptonaut/subscriptions","organizations_url":"https://api.github.com/users/zeptonaut/orgs","repos_url":"https://api.github.com/users/zeptonaut/repos","events_url":"https://api.github.com/users/zeptonaut/events{/privacy}","received_events_url":"https://api.github.com/users/zeptonaut/received_events","type":"User","site_admin":false},"assignees":[{"login":"zeptonaut","id":1407397,"avatar_url":"https://avatars.githubusercontent.com/u/1407397?v=3","gravatar_id":"","url":"https://api.github.com/users/zeptonaut","html_url":"https://github.com/zeptonaut","followers_url":"https://api.github.com/users/zeptonaut/followers","following_url":"https://api.github.com/users/zeptonaut/following{/other_user}","gists_url":"https://api.github.com/users/zeptonaut/gists{/gist_id}","starred_url":"https://api.github.com/users/zeptonaut/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zeptonaut/subscriptions","organizations_url":"https://api.github.com/users/zeptonaut/orgs","repos_url":"https://api.github.com/users/zeptonaut/repos","events_url":"https://api.github.com/users/zeptonaut/events{/privacy}","received_events_url":"https://api.github.com/users/zeptonaut/received_events","type":"User","site_admin":false},{"login":"anniesullie","id":4331931,"avatar_url":"https://avatars.githubusercontent.com/u/4331931?v=3","gravatar_id":"","url":"https://api.github.com/users/anniesullie","html_url":"https://github.com/anniesullie","followers_url":"https://api.github.com/users/anniesullie/followers","following_url":"https://api.github.com/users/anniesullie/following{/other_user}","gists_url":"https://api.github.com/users/anniesullie/gists{/gist_id}","starred_url":"https://api.github.com/users/anniesullie/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/anniesullie/subscriptions","organizations_url":"https://api.github.com/users/anniesullie/orgs","repos_url":"https://api.github.com/users/anniesullie/repos","events_url":"https://api.github.com/users/anniesullie/events{/privacy}","received_events_url":"https://api.github.com/users/anniesullie/received_events","type":"User","site_admin":false},{"login":"Apeliotes","id":7633415,"avatar_url":"https://avatars.githubusercontent.com/u/7633415?v=3","gravatar_id":"","url":"https://api.github.com/users/Apeliotes","html_url":"https://github.com/Apeliotes","followers_url":"https://api.github.com/users/Apeliotes/followers","following_url":"https://api.github.com/users/Apeliotes/following{/other_user}","gists_url":"https://api.github.com/users/Apeliotes/gists{/gist_id}","starred_url":"https://api.github.com/users/Apeliotes/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/Apeliotes/subscriptions","organizations_url":"https://api.github.com/users/Apeliotes/orgs","repos_url":"https://api.github.com/users/Apeliotes/repos","events_url":"https://api.github.com/users/Apeliotes/events{/privacy}","received_events_url":"https://api.github.com/users/Apeliotes/received_events","type":"User","site_admin":false}],"milestone":{"url":"https://api.github.com/repos/catapult-project/catapult/milestones/9","html_url":"https://github.com/catapult-project/catapult/milestones/M54","labels_url":"https://api.github.com/repos/catapult-project/catapult/milestones/9/labels","id":1841113,"number":9,"title":"M54","description":"","creator":{"login":"zeptonaut","id":1407397,"avatar_url":"https://avatars.githubusercontent.com/u/1407397?v=3","gravatar_id":"","url":"https://api.github.com/users/zeptonaut","html_url":"https://github.com/zeptonaut","followers_url":"https://api.github.com/users/zeptonaut/followers","following_url":"https://api.github.com/users/zeptonaut/following{/other_user}","gists_url":"https://api.github.com/users/zeptonaut/gists{/gist_id}","starred_url":"https://api.github.com/users/zeptonaut/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/zeptonaut/subscriptions","organizations_url":"https://api.github.com/users/zeptonaut/orgs","repos_url":"https://api.github.com/users/zeptonaut/repos","events_url":"https://api.github.com/users/zeptonaut/events{/privacy}","received_events_url":"https://api.github.com/users/zeptonaut/received_events","type":"User","site_admin":false},"open_issues":15,"closed_issues":15,"state":"open","created_at":"2016-06-21T17:23:13Z","updated_at":"2016-07-21T23:06:57Z","due_on":"2016-08-25T04:00:00Z","closed_at":null},"comments":2,"created_at":"2016-07-21T06:39:11Z","updated_at":"2016-07-21T23:06:57Z","closed_at":"2016-07-21T23:06:57Z","body":"Steps for merging:\r\n\r\n1) (Optional?) Rebase a local copy of polymer10-migration branch onto master. This will be the vast majority of the work involved if we do it. But it will leave us with a linear history for the Catapult repo. It should at least be attempted to see if it's a reasonable amount of work.\r\n\r\nSteps:\r\nCreate a local branch.\r\nRebase local branch onto master.\r\n\r\nFixing the conflicts will be the hardest part. I highly suggest using the following merge cl's as reference:\r\nhttps://codereview.chromium.org/2101873002/ \r\nhttps://codereview.chromium.org/2162963002/\r\n\r\n2) Verify you're working on a clean local version of master, and (locally) merge the (rebased) local branch of polymer10-migration.\r\n\r\nIf we rebased first, this should be trivial. If not, there will be a much smaller number of conflicts that need to be fixed at this stage instead. (Ie, all changes to master since the second merge cl above.)\r\n\r\n3) Test.\r\n\r\nVerify the end state of the diff against master and the polymer10-migration branch. Especially that there are very few changes to master outside of dashboard/dashboard/elements and tracing/\r\n\r\nVerify all unit tests pass.\r\n\r\nManually test. Try creating a trace, and looking at it. Deploy dashboard, and try triaging an alert and looking for a graph. Ask anyone in the SI hangout to help poke at it. I'd suggest at least 3 people looking at tracing and dashboard.\r\n\r\n4) Push the local copy of master to origin.\r\n\r\nThis has a fairly good explanation of how to merge both with and without a rebase: https://www.atlassian.com/git/tutorials/merging-vs-rebasing"}}
{"actor":{"display_login":"eakuefner"}}