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
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
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
[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
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
On 14/03/14 8:24 PM, "Hugo Trippaers" wrote:
>Hey Muralli,
>
>The branch is already cut and the jenkins builds are setup. So i¹m not
>going to recreate the 4.4 branch from master as all the version number
>are already updated.
>
>Which merge request are you merging in? If you can squash it it wil
...@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
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
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.
Hey Muralli,
The branch is already cut and the jenkins builds are setup. So i’m not going to
recreate the 4.4 branch from master as all the version number are already
updated.
Which merge request are you merging in? If you can squash it it will be easy to
pull into master and 4.4.
Cheers,
H
On 14/03/14 7:09 PM, "h...@apache.org" wrote:
>Repository: cloudstack
>Updated Branches:
> refs/heads/4.4 [created] 3ee1fc28d
>
Hugo,
I was holding off merge to master, as it seems to be broken now. I see
that you already created 4.4 branch. Can we wait till master is ready to
be checked-in an
Isaac, I tried some of your changes. Looks good.
Regards,
Saksham
-Original Message-
From: Isaac Chiang [mailto:isaacchi...@gmail.com]
Sent: Wednesday, July 24, 2013 3:12 PM
To: Pranav Saxena
Cc: dev@cloudstack.apache.org
Subject: Re: Git Push Summary
Hi all,
I've been wo
> Sent: Wednesday, July 24, 2013 3:12 PM
> To: Pranav Saxena
> Cc: dev@cloudstack.apache.org
> Subject: Re: Git Push Summary
>
> Hi all,
> I've been working on re-factoring the dedication UI code in these
> days and just finished.
> I discussed the req
t; >> the master branch or replace the entire system.js file in your branch
> >> in the master assuming you forked your branch out of master and there
> >> haven't been other changes in system.js file . First option is a safer
> approach though !!
> >>
> >> Thanks,
> >> Pranav
Not there in 4.2?
-Original Message-
From: Isaac Chiang [mailto:isaacchi...@gmail.com]
Sent: Wednesday, July 24, 2013 3:12 PM
To: Pranav Saxena
Cc: dev@cloudstack.apache.org
Subject: Re: Git Push Summary
Hi all,
I've been working on re-factoring the dedication UI code in
irst
>> option is a safer approach though !!
>>
>> Thanks,
>> Pranav
>>
>>
>> On Thu, Jul 18, 2013 at 8:18 AM, Isaac Chiang wrote:
>>
>>> Hi Pranav:
>>> I just pushed part of modified code in to the branch.
>>&g
013 at 8:18 AM, Isaac Chiang wrote:
>
>> Hi Pranav:
>> I just pushed part of modified code in to the branch.
>> Please have a look if the commit fix the issue as expected.
>>
>> Thanks,
>>
>> Regards
>>
>>
>> -
cted.
>
> Thanks,
>
> Regards
>
>
> -- Forwarded message --
> From: Pranav Saxena
> Date: Tue, Jul 16, 2013 at 4:52 PM
> Subject: Re: Git Push Summary
> To: dev@cloudstack.apache.org, jessica.w...@citrix.com,
> sonny.ch...@citrix.com
> Cc: comm.
Thanks Isaac for creating this branch. I'll keep an eye on the commits you
make your here . Once the code for handling nested query API calls are
ready , you can merge it into master.
@Jessica - I have had conversations with Isaac and he is in the process of
re-factoring the code for dedicated res
Chip,
> all my fixes that I've put to this branch, were originally committed to
> master.
Me, too.
Jessica
-Original Message-
From: Alena Prokharchyk
Sent: Tuesday, June 18, 2013 12:32 PM
To: Chip Childers; dev@cloudstack.apache.org
Cc: Jessica Wang; Min Chen
Subject: R
Yes, my commit is also pushed master.
Thanks
-min
On 6/18/13 12:34 PM, "Chip Childers" wrote:
>Gotcha!
>
>So are you folks using this branch to do some testing now? Sounds like
>a great idea to start testing before the last big merges come in.
>
>-chip
>
>On Tue, Jun 18, 2013 at 07:32:10PM +00
Gotcha!
So are you folks using this branch to do some testing now? Sounds like
a great idea to start testing before the last big merges come in.
-chip
On Tue, Jun 18, 2013 at 07:32:10PM +, Alena Prokharchyk wrote:
> Chip, all my fixes that I've put to this branch, were originally committed
Chip, all my fixes that I've put to this branch, were originally committed
to master. I cherry-picked them to the master-6-17-stable.
commit 5d0a1cee13fb3006f3e35cd221e553587ea20ce2
Author: Alena Prokharchyk
Date: Mon Jun 17 16:10:12 2013 -0700
CLOUDSTACK-2883: create default network offe
Min, Jessica, Alena,
What's going on in this branch?
The commits are curious. Are these fixes going into master?
On Mon, Jun 17, 2013 at 07:37:52PM +, Chiradeep Vittal wrote:
> David, this is a temporary scratch branch to perform some integration
> testing since atm the master looks stable.
David, this is a temporary scratch branch to perform some integration
testing since atm the master looks stable.
On 6/17/13 11:57 AM, "David Nalley" wrote:
>What is this branch for?
>On Jun 17, 2013 1:27 PM, wrote:
>
>> Updated Branches:
>> refs/heads/master-6-17-stable [created] fc16e29f9
>>
What is this branch for?
On Jun 17, 2013 1:27 PM, wrote:
> Updated Branches:
> refs/heads/master-6-17-stable [created] fc16e29f9
>
26 matches
Mail list logo
