ok, we agree I was going to wait on Rohit's ping and then re-merge and push
Op do 7 mei 2015 om 12:42 schreef Abhinandan Prateek < abhinandan.prat...@shapeblue.com>: > Daan, > > I was thinking voting will be concluded today ( looks like I confused it > with GA). > Anyhow it can be done now, in case there are issues they can be merged as > and when there are relevant commits. > > > > On 07-May-2015, at 3:50 pm, Daan Hoogland <daan.hoogl...@gmail.com> > wrote: > > > > why not before Abhi? as we have an RC we could merge now. > > > > > > Op do 7 mei 2015 om 11:59 schreef Abhinandan Prateek < > > abhinandan.prat...@shapeblue.com>: > > > >> +1 > >> > >> Lets merge as soon as we have 4.5 GA. > >> > >>> On 07-May-2015, at 2:47 pm, Daan Hoogland <daan.hoogl...@gmail.com> > >> wrote: > >>> > >>> LS, > >>> > >>> announce part: As we have an rc that did not get any -1 yet I want to > >> merge > >>> 4.5 in master now. It will result in 389 commits being merged without > >>> conflicts detectable by git. That is not an fool proof guarantee of a > >>> working system of course, hence this heads up. > >>> > >>> proposal part: I would like to merge back the last release branch as > part > >>> of the release candidate creation script. First as part of the > procedure, > >>> later in build_asf.sh. > >>> > >>> +/-1? > >> > >> 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 Software Engineering< > >> http://shapeblue.com/cloudstack-software-engineering/> > >> 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. > >> > > 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 Software Engineering< > http://shapeblue.com/cloudstack-software-engineering/> > 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. >