Re: [ACS4.4] RE: Git Push Summary : 4.4 feature branch

2014-03-14 Thread Hugo Trippaers
being pulled in to 4.4, we might as well cut >>> branch a little later where approved merge queue is cleared. >>> >>> >>> -Original Message- >>> From: Abhinandan Prateek [mailto:abhinandan.prat...@citrix.com] >>> Sent: Friday, March 14, 20

Re: [ACS4.4] RE: Git Push Summary : 4.4 feature branch

2014-03-14 Thread Marcus
lso in this time zone? >> If specific features are being pulled in to 4.4, we might as well cut branch >> a little later where approved merge queue is cleared. >> >> >> -Original Message- >> From: Abhinandan Prateek [mailto:abhinandan.prat...@citrix.com

Re: Git Push Summary : 4.4 feature branch

2014-03-14 Thread Mike Tutkowski
Since a lot of devs are basing their features that have not yet been placed in Git off of master (which is now 4.5), we need to make sure it is clear not to rebase yourself beyond 48f8a95b06b0348ba1349cb5434183c2c18710db or 4.5 code that should not be in 4.4 could be brought into 4.4. On Fri, Mar

Re: [ACS4.4] RE: Git Push Summary : 4.4 feature branch

2014-03-14 Thread Hugo Trippaers
[mailto:abhinandan.prat...@citrix.com] > Sent: Friday, March 14, 2014 7:56 AM > To: dev@cloudstack.apache.org > Subject: Re: Git Push Summary : 4.4 feature branch > > Yes, I think we could have checked with people struggling to fix the master > and commit there features. > -1 for the

Re: Git Push Summary : 4.4 feature branch

2014-03-14 Thread Abhinandan Prateek
Thanks Hugo ! Saw your reply bit late. On 14/03/14 8:34 pm, "Hugo Trippaers" wrote: >I announced the time when i would cut the branch in advance, so it >shouldn¹t be a surprise. > >But like i replied to Muralli, if you have a pending merge request on the >ML i see no problem with merging it in i

[ACS4.4] RE: Git Push Summary : 4.4 feature branch

2014-03-14 Thread Sudha Ponnaganti
...@citrix.com] Sent: Friday, March 14, 2014 7:56 AM To: dev@cloudstack.apache.org Subject: Re: Git Push Summary : 4.4 feature branch Yes, I think we could have checked with people struggling to fix the master and commit there features. -1 for the timing to cut the branch ! On 14/03/14 8:19 pm, "M

Re: Git Push Summary : 4.4 feature branch

2014-03-14 Thread Hugo Trippaers
I announced the time when i would cut the branch in advance, so it shouldn’t be a surprise. But like i replied to Muralli, if you have a pending merge request on the ML i see no problem with merging it in in the next few hours because of the trouble with master. Just make sure it hits both mast

Re: Git Push Summary : 4.4 feature branch

2014-03-14 Thread Abhinandan Prateek
Yes, I think we could have checked with people struggling to fix the master and commit there features. -1 for the timing to cut the branch ! On 14/03/14 8:19 pm, "Murali Reddy" wrote: >On 14/03/14 7:09 PM, "h...@apache.org" wrote: > >>Repository: cloudstack >>Updated Branches: >> refs/heads/4.