On Mon, Feb 11, 2013 at 09:39:08AM -0800, Alex Huang wrote:
> I don't want to speak for Chip here but I would prefer the other way.
>
> The developers should create issues on jira as to why it's being fixed in
> 4.1, check it into 4.1, and cherry-pick to master.
>
> Just checking into master a
Yes we need to keep them in sync otherwise it will become a herculean effort
later
> -Original Message-
> From: Hugo Trippaers [mailto:htrippa...@schubergphilis.com]
> Sent: Monday, February 11, 2013 8:57 AM
> To: cloudstack-dev@incubator.apache.org
> Subject: Diff sta
.apache.org
> Subject: RE: Diff stat master vs 4.1
>
> I don't want to speak for Chip here but I would prefer the other way.
>
> The developers should create issues on jira as to why it's being fixed in 4.1,
> check it into 4.1, and cherry-pick to master.
>
> Just
hat should go in.
--Alex
> -Original Message-
> From: Hugo Trippaers [mailto:htrippa...@schubergphilis.com]
> Sent: Monday, February 11, 2013 9:06 AM
> To: 'Rohit Yadav'
> Cc: cloudstack-dev@incubator.apache.org
> Subject: RE: Diff stat master vs 4.1
>
>
> -Original Message-
> From: rohityada...@gmail.com [mailto:rohityada...@gmail.com] On Behalf
> Of Rohit Yadav
> Sent: Monday, February 11, 2013 6:03 PM
> To: Hugo Trippaers
> Cc: cloudstack-dev@incubator.apache.org
> Subject: Re: Diff stat master vs 4.1
>
+1
There a lot of commits on master which are not backported to 4.1, for
example packaging stuff etc. Bug fixes (for 4.1) should go in both
master and 4.1, so let's save some trouble for our release manager and
as developers take the responsibility to cherry-pick/backport on 4.1.
Regards.
On Mon
Hey all,
Just a reminder; Master and 4.1 are starting to diverge, this is not
necessarily a bad thing at this time, but please make sure that any fixes you
make for 4.1 are pushed into both trees.
[spark@cloudstack-dev5 incubator-cloudstack]$ git status
# On branch 4.1
nothing to commit (workin
