I would rather CI be considered together with this thread, since this thread needs to decide at what condition RM can merge a hotfix/bugfic branch to release branch.
Thanks -min Sent from my iPhone > On Aug 19, 2014, at 8:09 AM, "Pierre-Luc Dion" <pd...@cloudops.com> wrote: > > +1 , CI shouldn't be another topic? > > What is required or missing to have CI in place? > > > *Pierre-Luc DION* > Architecte de Solution Cloud | Cloud Solutions Architect > t 855.652.5683 > > *CloudOps* Votre partenaire infonuagique* | *Cloud Solutions Experts > 420 rue Guy *|* Montreal *|* Quebec *|* H3J 1S6 > w cloudops.com *|* tw @CloudOps_ > > > > On Tue, Aug 19, 2014 at 5:50 AM, Rohit Yadav <rohit.ya...@shapeblue.com> > wrote: > >> >>> On 19-Aug-2014, at 11:29 am, Sebastien Goasguen <run...@gmail.com> wrote: >>> Say you grab a patch from review board and stick it in a hotfix branch, >> test that …call for merge on release branch. >>> Do we *merge* to master or can we apply the patch directly to master >> (git am -s…) ? >> >> Once the hotfix branch is merged on release branch, we would merge the >> release branch to master, that will bring the hotfix on master as well. >> >> We don’t want to encourage working on master for fixes that qualify for >> release branches directly so ideally we should not git am -s the patch on >> master. But there is scope for non-strictness for a situation needing git >> am -s <patch> on master directly, it would be at the discretion of the RM >> and committers. >> >> Regards, >> Rohit Yadav >> Software Architect, ShapeBlue >> M. +41 779015219 | rohit.ya...@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 – rapid IaaS deployment framework<http://shapeblue.com/csforge/> >> CloudStack Consulting<http://shapeblue.com/cloudstack-consultancy/> >> CloudStack Infrastructure Support< >> http://shapeblue.com/cloudstack-infrastructure-support/> >> CloudStack Bootcamp Training Courses< >> http://shapeblue.com/cloudstack-training/> >> >> 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 >> represent those of Shape Blue Ltd or related companies. If you are not the >> intended 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 you believe you have received this email in error. Shape Blue Ltd is a >> company incorporated in England & Wales. ShapeBlue Services India LLP is a >> company 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 company registered by The Republic of South Africa and is traded under >> license from Shape Blue Ltd. ShapeBlue is a registered trademark. >>
