As one of the folks who are doing *that* (and also travelling), I did not know
if there are people merging branches or if there was a planned 4.5 to master
merge.
Some of the things I’m fixing wrt KVM needs to be manually cherry-picked or
fixed due to recent refactoring work, so I may be making
not sure daan.
Check the branch merge-45-to-master[1] for the conflicts
If we agree to only do merge from 4.5, then its worth resolving. Otherwise,
its a waste of time for the one who does the merge, with folks doing high
density individual commits.
[1] https://github.com/apache/cloudstack/compa
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 :
> 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
> wrote:
>
> 4.5 sho
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
wrote:
4.5 should be merged. no individual commits.
Op vr 22 mei 2015 om 06:22 schreef Rajani Karuturi >:
> Are we merging from 4.5 to master or doing individual commits
4.5 should be merged. no individual commits.
Op vr 22 mei 2015 om 06:22 schreef Rajani Karuturi :
> 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
>
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
