{"action":"created","issue":{"url":"https://api.github.com/repos/brianchandotcom/liferay-portal/issues/33546","labels_url":"https://api.github.com/repos/brianchandotcom/liferay-portal/issues/33546/labels{/name}","comments_url":"https://api.github.com/repos/brianchandotcom/liferay-portal/issues/33546/comments","events_url":"https://api.github.com/repos/brianchandotcom/liferay-portal/issues/33546/events","html_url":"https://github.com/brianchandotcom/liferay-portal/pull/33546","id":122920779,"number":33546,"title":"Re-sync for Tentative Beta Release","user":{"login":"ZoltanTakacs","id":2045409,"avatar_url":"https://avatars.githubusercontent.com/u/2045409?v=3","gravatar_id":"","url":"https://api.github.com/users/ZoltanTakacs","html_url":"https://github.com/ZoltanTakacs","followers_url":"https://api.github.com/users/ZoltanTakacs/followers","following_url":"https://api.github.com/users/ZoltanTakacs/following{/other_user}","gists_url":"https://api.github.com/users/ZoltanTakacs/gists{/gist_id}","starred_url":"https://api.github.com/users/ZoltanTakacs/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ZoltanTakacs/subscriptions","organizations_url":"https://api.github.com/users/ZoltanTakacs/orgs","repos_url":"https://api.github.com/users/ZoltanTakacs/repos","events_url":"https://api.github.com/users/ZoltanTakacs/events{/privacy}","received_events_url":"https://api.github.com/users/ZoltanTakacs/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":null,"milestone":null,"comments":2,"created_at":"2015-12-18T10:14:31Z","updated_at":"2015-12-22T06:04:51Z","closed_at":"2015-12-18T22:40:14Z","pull_request":{"url":"https://api.github.com/repos/brianchandotcom/liferay-portal/pulls/33546","html_url":"https://github.com/brianchandotcom/liferay-portal/pull/33546","diff_url":"https://github.com/brianchandotcom/liferay-portal/pull/33546.diff","patch_url":"https://github.com/brianchandotcom/liferay-portal/pull/33546.patch"},"body":"Hi Brian,\r\n\r\nWe'd like to sync 7.0.x from master @https://github.com/liferay/liferay-portal/commit/3bf29e6f5271e43d3a4e1539bbd4ca04f6e89043\r\n\r\n**Diffs:**\r\n1) https://github.com/liferay/liferay-portal/compare/3c8daeaa6209f712ccf17467f67fc888dde0bac3...eb309ed903be2d431e8a1b1d6bcc1815498e28ba were omitted from 7.0.x as it caused merge conflict when I rebased master.\r\n2) https://github.com/liferay/liferay-portal/commit/c98c005\r\n3) https://github.com/liferay/liferay-portal/commit/b3a4a0f85959173df16232800e8a4540ae29759d\r\n4) I needed to revert the changes that were backported on the top of the latest re-sync M7: https://github.com/brianchandotcom/liferay-portal/pull/29126 because there were a lot of conflicting code and I cannot think of any other solution which doesn't involves manual conflict resolution.\r\nI did it in one commit and contains the last 316 commits reverted from 7.0.x: \r\nhttps://github.com/liferay/liferay-portal/commit/03c0e8288b375d1f887c7be5efee6080d02b1cdc\r\n5) Roll back was needed to the state of this pull request [Re-sync with master for A1](https://github.com/brianchandotcom/liferay-portal/pull/30346) to be able to continue the branch without manual conflict resolution: https://github.com/liferay/liferay-portal/commit/8fb0337ce7b5021a0cb6ee10467fa893100ad8b0\r\n6) Roll back to [Re-sync with master for A2](https://github.com/brianchandotcom/liferay-portal/pull/31421) to be able to continue the branch: https://github.com/liferay/liferay-portal/commit/0a2f358b4ce9e955f15c5efdd4991927b5f5cd4c\r\n7) Roll back to [Re-sync with master for A3](https://github.com/brianchandotcom/liferay-portal/pull/32148) to be able to continue the branch: https://github.com/liferay/liferay-portal/commit/2bec87364e3066b98790ffc7ccc8396597948c9c\r\n8) Roll back to [Re-sync #2 for Liferay 7 Alpha 3](https://github.com/brianchandotcom/liferay-portal/pull/32305) to be able to continue the branch: https://github.com/liferay/liferay-portal/commit/d641486ec4bb34240a487010c10cbe2ff35d46e6\r\n\r\n@CAustin582, can you please update the *ReleaseInfo.java* with the current release information?\r\nhttps://github.com/ZoltanTakacs/liferay-portal/blob/70xb1/portal-service/src/com/liferay/portal/kernel/util/ReleaseInfo.java#L171\r\nhttps://github.com/ZoltanTakacs/liferay-portal/blob/70xb1/portal-service/src/com/liferay/portal/kernel/util/ReleaseInfo.java#L155\r\n\r\n/cc @brianchiu, @jhendley @stattuskuo\r\n\r\nThank you,\r\nZoltán"},"comment":{"url":"https://api.github.com/repos/brianchandotcom/liferay-portal/issues/comments/166520571","html_url":"https://github.com/brianchandotcom/liferay-portal/pull/33546#issuecomment-166520571","issue_url":"https://api.github.com/repos/brianchandotcom/liferay-portal/issues/33546","id":166520571,"user":{"login":"brianchandotcom","id":282080,"avatar_url":"https://avatars.githubusercontent.com/u/282080?v=3","gravatar_id":"","url":"https://api.github.com/users/brianchandotcom","html_url":"https://github.com/brianchandotcom","followers_url":"https://api.github.com/users/brianchandotcom/followers","following_url":"https://api.github.com/users/brianchandotcom/following{/other_user}","gists_url":"https://api.github.com/users/brianchandotcom/gists{/gist_id}","starred_url":"https://api.github.com/users/brianchandotcom/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/brianchandotcom/subscriptions","organizations_url":"https://api.github.com/users/brianchandotcom/orgs","repos_url":"https://api.github.com/users/brianchandotcom/repos","events_url":"https://api.github.com/users/brianchandotcom/events{/privacy}","received_events_url":"https://api.github.com/users/brianchandotcom/received_events","type":"User","site_admin":false},"created_at":"2015-12-22T06:04:51Z","updated_at":"2015-12-22T06:04:51Z","body":"@CAustin582 I also updated the ReleaseInfo, see 2023adab01b1991a69caf40aa5682eeefdab205d"}}