Re: [boost] Master branch is open for merging

Subject: Re: [boost] Master branch is open for merging
From: Marshall Clow (mclow.lists_at_[hidden])
Date: 2015-12-10 14:34:17

On Thu, Dec 10, 2015 at 11:07 AM, Rene Rivera <grafikrobot_at_[hidden]> wrote:

> On Tue, Dec 8, 2015 at 9:52 PM, Rene Rivera <grafikrobot_at_[hidden]> wrote:
>
> > On Tue, Dec 8, 2015 at 9:17 PM, Edward Diener <eldiener_at_[hidden]>
> > wrote:
> >
> >> On 12/8/2015 12:13 PM, Marshall Clow wrote:
> >>
> >>> Thanks to everyone for their patience; the master branch is now open
> for
> >>> merging.
> >>>
> >>> Remember, we're coming up to a release, so please, no breaking changes.
> >>>
> >>> Thanks!
> >>>
> >>
> >> For VMD I merged for some documentation changes and some code I have
> been
> >> testing successfully on develop for awhile. I am totally confident that
> the
> >> merged code changes are correct and produce no breaking changes. I
> assume
> >> these changes will make it into the 1.60 release.
> >
> >
> > Assuming that they don't get rolled back (for example because they cause
> > breakage) master merges done now will make it into the release.
> >
>
> I just realized I misspoke on this. IIRC, one of the managers needs to
> merge whatever master change into the actual release. Is that right
> Marshall?
>
>
No, it will happen automatically, as long as you merge to master before
Sunday night.

-- Marshall

(There'a an automatic process that does this; it gets turned off when we're
actually building a release - it is not off now)