> Commit first to the release throttle, then "git cherry-pick" into master
Next release, next reminder why [1] I think the order should be reversed. Vratko. [1] https://lists.fd.io/g/vpp-dev/message/12786 -----Original Message----- From: vpp-dev@lists.fd.io <vpp-dev@lists.fd.io> On Behalf Of Andrew Yourtchenko Sent: Wednesday, July 31, 2019 10:26 PM To: vpp-dev <vpp-dev@lists.fd.io> Subject: [vpp-dev] 19.08 RC1 Milestone (stable branch pull) is next Wed 7 Aug 2019! Hi all, F0 milestone is complete. RC1 milestone is scheduled to for next Wednesday 7 August 2019, commencing at 18:00 UTC. Please get all of the low-risk patches required for VPP Release 19.08 merged into master branch before then. On Wednesday at 18:00 UTC the branch 'master' will be closed for the period of time that it takes to create 'stable/1908' with the associated Jenkins jobs operational. A refresher about the life after RC1: Once the stable branch is pulled, only bug fixes are allowed to be merged there, and all bug fixes should conform to the following rules: - All bug fixes must be double-committed to the release throttle as well as to the master branch - Commit first to the release throttle, then "git cherry-pick" into master - Manual merges may be required, depending on the degree of divergence between throttle and master - All bug fixes need to have a Jira ticket - Please put Jira IDs into the commit messages. - Please use the same Jira ID for commits into the stable branch and master. --a <Your friendly 19.08 release manager>
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13645): https://lists.fd.io/g/vpp-dev/message/13645 Mute This Topic: https://lists.fd.io/mt/32671722/21656 Group Owner: vpp-dev+ow...@lists.fd.io Unsubscribe: https://lists.fd.io/g/vpp-dev/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
