cloudstack-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Daan Hoogland <daan.hoogl...@gmail.com>
Subject Re: commits from 4.5 to master
Date Fri, 22 May 2015 11:19:04 GMT
that must have been a while ago, was it? after 4.5 I did a merge with only
minor problems.

Op vr 22 mei 2015 om 12:33 schreef Rajani Karuturi <rajani@apache.org>:

> When I tried to do it, I saw lot of conflicts especially in dbupgrade file.
>
>
> On Fri, May 22, 2015 at 13:05 PM, Daan Hoogland <daan.hoogland@gmail.com>
> wrote:
>
> 4.5 should be merged. no individual commits.
>
> Op vr 22 mei 2015 om 06:22 schreef Rajani Karuturi <rajani@apache.org
> <javascript:;>>:
>
> > Are we merging from 4.5 to master or doing individual commits?
> >
> > I see that both are being followed. It makes merging very easy if
> everybody
> > follows it.
> >
> > ~Rajani
> >
>
>
>
> --
> ~Rajani
> Sent from my Windows Phone
>

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