cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mike Tutkowski <mike.tutkow...@solidfire.com>
Subject Re: merge from 4.5 to master
Date Tue, 09 Dec 2014 05:39:29 GMT
So, in this case, the process would be to check the code into 4.5 and then
do an empty merge to master? Is that correct?

Thanks

On Mon, Dec 8, 2014 at 10:36 PM, Rajani Karuturi <rajani@apache.org> wrote:

> if you do an empty merge with that commit (-s ours), it would take care of
> it and will not come back in the next merges.
>
>
> ~Rajani
>
> On Tue, Dec 9, 2014 at 10:27 AM, Mike Tutkowski <
> mike.tutkowski@solidfire.com> wrote:
>
> > Have we ever decided what to do when people check code into, say, 4.5 and
> > it is not supposed to go into master?
> >
> > Merging everything from 4.5 to master is not always desired.
> >
> > On Mon, Dec 8, 2014 at 8:48 PM, Rajani Karuturi <rajani@apache.org>
> wrote:
> >
> > > 4.5 is merged to master as of
> > > commit 701199fca726c68b4fc09ec8939b4822e527e8c7
> > >
> > > I hope few more would try merging, now that the conflicts are resolved.
> > >
> > > ~Rajani
> > >
> > > On Mon, Dec 8, 2014 at 12:27 PM, Rajani Karuturi <rajani@apache.org>
> > > wrote:
> > >
> > > > last attempt was a failure with travis failures before and after the
> > pull
> > > > requests and hence abandoned the merge. Now that travis is green, I
> > > > planning to put up another pull request.
> > > >
> > > > let me know if you see any issues.
> > > >
> > > > ~Rajani
> > > >
> > >
> >
> >
> >
> > --
> > *Mike Tutkowski*
> > *Senior CloudStack Developer, SolidFire Inc.*
> > e: mike.tutkowski@solidfire.com
> > o: 303.746.7302
> > Advancing the way the world uses the cloud
> > <http://solidfire.com/solution/overview/?video=play>*™*
> >
>



-- 
*Mike Tutkowski*
*Senior CloudStack Developer, SolidFire Inc.*
e: mike.tutkowski@solidfire.com
o: 303.746.7302
Advancing the way the world uses the cloud
<http://solidfire.com/solution/overview/?video=play>*™*

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message