Mailing-List: contact dev-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cloudstack.apache.org
Received-SPF: pass (athena.apache.org: domain of rohit.yadav@shapeblue.com
 designates 213.199.154.20 as permitted sender)
From: Rohit Yadav <rohit.yadav@shapeblue.com>
To: "dev@cloudstack.apache.org" <dev@cloudstack.apache.org>
Subject: Re: [PROPOSAL] Solving the cherry-picking problem
Thread-Topic: [PROPOSAL] Solving the cherry-picking problem
Thread-Index: AQHPshspDxJ1hVq3uUKx1O+UM2xRYJvMwvWA
Date: Tue, 12 Aug 2014 09:55:45 +0000
Message-ID: <261F57EE-C5FD-4A75-AB36-339CFC410DD7@shapeblue.com>
References: <4ED46D00-442C-42C7-B6F9-5C5AAC51D191@shapeblue.com>
In-Reply-To: <4ED46D00-442C-42C7-B6F9-5C5AAC51D191@shapeblue.com>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="Windows-1252"
Content-ID: <69ED6CD59B15D441A2994F8F2BA60878@eurprd07.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Hi,

Just wanted to check if anyone has any feedback on this thread? Something w=
e want to discuss, add, change, adapt and adopt?
if we=92re all good I=92ll start a voting thread tonight for adopting this.

Cheers.

On 07-Aug-2014, at 10:39 am, Rohit Yadav <rohit.yadav@shapeblue.com> wrote:

> Hi,
>
> I think the following can solve the cherry-picking problem but it needs e=
veryone=92s support to work:
>
> - Once a release branch is cut out, all the committers and contributors =
=93should=94 only work on the release branch. It can be discussed if we wan=
t to work on it directly or branch out on it and work in that branch and ha=
ve RMs to merge that branch on the release branch. IMO if we work directly =
on the release branch we potentially reduce a lot of RM=92s work.
>
> - Only (new) feature development and related enhancements/bugfixes can la=
nd on master directly or merged from their respective branches.
>
> - The RMs or anyone would keep merging the release branch with fast forwa=
rd only on regular basis:
>      git checkout master
>      git merge --ff <release-branch>
>      <fix any conflicts and git commit -as etc.>
>
> This way =91master' gets all the good stuff from release branch and the r=
elease branch gets =93more attention=94.
>
> If we somehow can reduce the release cycle timeline/length, the divergenc=
e between master and release branches can be potentially less causing less =
conflicts/issues when following the above.
>
> Thoughts, flames?
>
> Regards.
>
> Regards,
> Rohit Yadav
> Software Architect, ShapeBlue
> M. +41 779015219 | rohit.yadav@shapeblue.com
> Blog: bhaisaab.org | Twitter: @_bhaisaab
>
>
>
> Find out more about ShapeBlue and our range of CloudStack related service=
s
>
> IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-buil=
d//>
> CSForge =96 rapid IaaS deployment framework<http://shapeblue.com/csforge/=
>
> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
> CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrast=
ructure-support/>
> CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-trai=
ning/>
>
> This email and any attachments to it may be confidential and are intended=
 solely for the use of the individual to whom it is addressed. Any views or=
 opinions expressed are solely those of the author and do not necessarily r=
epresent those of Shape Blue Ltd or related companies. If you are not the i=
ntended recipient of this email, you must neither take any action based upo=
n its contents, nor copy or show it to anyone. Please contact the sender if=
 you believe you have received this email in error. Shape Blue Ltd is a com=
pany incorporated in England & Wales. ShapeBlue Services India LLP is a com=
pany incorporated in India and is operated under license from Shape Blue Lt=
d. Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil a=
nd is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a=
 company registered by The Republic of South Africa and is traded under lic=
ense from Shape Blue Ltd. ShapeBlue is a registered trademark.

Regards,
Rohit Yadav
Software Architect, ShapeBlue
M. +41 779015219 | rohit.yadav@shapeblue.com
Blog: bhaisaab.org | Twitter: @_bhaisaab


Find out more about ShapeBlue and our range of CloudStack related services

IaaS Cloud Design & Build<http://shapeblue.com/iaas-cloud-design-and-build/=
/>
CSForge =96 rapid IaaS deployment framework<http://shapeblue.com/csforge/>
CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/>
CloudStack Infrastructure Support<http://shapeblue.com/cloudstack-infrastru=
cture-support/>
CloudStack Bootcamp Training Courses<http://shapeblue.com/cloudstack-traini=
ng/>

This email and any attachments to it may be confidential and are intended s=
olely for the use of the individual to whom it is addressed. Any views or o=
pinions expressed are solely those of the author and do not necessarily rep=
resent those of Shape Blue Ltd or related companies. If you are not the int=
ended recipient of this email, you must neither take any action based upon =
its contents, nor copy or show it to anyone. Please contact the sender if y=
ou believe you have received this email in error. Shape Blue Ltd is a compa=
ny incorporated in England & Wales. ShapeBlue Services India LLP is a compa=
ny incorporated in India and is operated under license from Shape Blue Ltd.=
 Shape Blue Brasil Consultoria Ltda is a company incorporated in Brasil and=
 is operated under license from Shape Blue Ltd. ShapeBlue SA Pty Ltd is a c=
ompany registered by The Republic of South Africa and is traded under licen=
se from Shape Blue Ltd. ShapeBlue is a registered trademark.