If I read https://github.com/apache/mesos/blob/master/docs/release-guide.md correctly, that is actually what we do: create 1.1.x branch before 1.1.0. If the vote does not pass, we cherry-pick and fix in that branch.
With this commit I haven't created any branches, *just* a placeholder for a future changelog. Does this make sense? On Thu, Nov 10, 2016 at 2:19 AM, Benjamin Mahler <[email protected]> wrote: > We wouldn't normally create the 1.1.x branch before 1.1.0 is released. If > 1.1.0 doesn't go through this branch needs to be rebased and force pushed? > > On Tue, Nov 8, 2016 at 1:56 PM, <[email protected]> wrote: > >> Added MESOS-6142 to CHANGELOG for 1.1.1. >> >> >> Project: http://git-wip-us.apache.org/repos/asf/mesos/repo >> Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/550d13c3 >> Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/550d13c3 >> Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/550d13c3 >> >> Branch: refs/heads/1.1.x >> Commit: 550d13c3dffe4d3b86c74ca40fb539796cefd848 >> Parents: 0023d38 >> Author: Alexander Rukletsov <[email protected]> >> Authored: Tue Nov 8 22:57:24 2016 +0100 >> Committer: Alexander Rukletsov <[email protected]> >> Committed: Tue Nov 8 22:57:24 2016 +0100 >> >> ---------------------------------------------------------------------- >> CHANGELOG | 4 ++++ >> 1 file changed, 4 insertions(+) >> ---------------------------------------------------------------------- >> >> >> http://git-wip-us.apache.org/repos/asf/mesos/blob/550d13c3/CHANGELOG >> ---------------------------------------------------------------------- >> diff --git a/CHANGELOG b/CHANGELOG >> index a305da1..28bc827 100644 >> --- a/CHANGELOG >> +++ b/CHANGELOG >> @@ -2,6 +2,10 @@ Release Notes - Mesos - Version 1.1.1 (WIP) >> ------------------------------------------- >> * This is a bug fix release. >> >> +All Issues: >> +** Bug >> + * [MESOS-6142] - Frameworks may RESERVE for an arbitrary role. >> + >> >> Release Notes - Mesos - Version 1.1.0 >> ------------------------------------- >> >> >
