You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@cloudstack.apache.org by Rajesh Battala <ra...@citrix.com> on 2014/05/05 10:44:10 UTC
cherry-pick requests
Hi Daan,
Please cherry-pick these commits to 4.4 branch.
1 6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c
CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest network configured on the eth device
2. cf41ccaa5b6475dace0bddbe6681c98cc5149189
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=cf41ccaa5b6475dace0bddbe6681c98cc5149189
CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in VR/VpcVR to configure VPC entities
3. 144990df11b2d7eb2ece50a043aea26b9eddfdda
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=144990df11b2d7eb2ece50a043aea26b9eddfdda
Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork prepare command got changed
Thanks
Rajesh Battala
RE: cherry-pick requests
Posted by Rajesh Battala <ra...@citrix.com>.
Hi Daan,
I have fixed the ^M characters with this fix.
please cherry-pick
1. cf41ccaa5b6475dace0bddbe6681c98cc5149189
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest network configured on the eth device
and then cherry pick
648a724dfc49222873124089464ccda92278fa9f
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=648a724dfc49222873124089464ccda92278fa9f
which will solve line ending issues.
Thanks
Rajesh Battala
-----Original Message-----
From: Rajesh Battala [mailto:rajesh.battala@citrix.com]
Sent: Monday, May 5, 2014 5:17 PM
To: dev@cloudstack.apache.org
Subject: RE: cherry-pick requests
those are .cs files. As I was working with them on windows it could have got introduced.
I will correct them and request for a new cherry-pick.
Thanks
Rajesh Battala
-----Original Message-----
From: Daan Hoogland [mailto:daan.hoogland@gmail.com]
Sent: Monday, May 5, 2014 2:52 PM
To: dev
Subject: Re: cherry-pick requests
cf41ccaa5b6475dace0bddbe6681c98cc5149189 is introducing ^M line endings. please make sure your env is clean. I hate to be nitpicking but can you fix/prevent this?
I pushed the other two to wip-git.
On Mon, May 5, 2014 at 10:44 AM, Rajesh Battala <ra...@citrix.com> wrote:
> Hi Daan,
>
> Please cherry-pick these commits to 4.4 branch.
>
> 1 6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c
>
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6c
> d1c7ab32a5e4ca3228b25aa6bd6158cb57963c
> CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest
> network configured on the eth device
>
>
> 2. cf41ccaa5b6475dace0bddbe6681c98cc5149189
>
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=cf
> 41ccaa5b6475dace0bddbe6681c98cc5149189
> CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in
> VR/VpcVR to configure VPC entities
>
> 3. 144990df11b2d7eb2ece50a043aea26b9eddfdda
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=14
> 4990df11b2d7eb2ece50a043aea26b9eddfdda
> Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork prepare
> command got changed
>
>
> Thanks
> Rajesh Battala
--
Daan
RE: cherry-pick requests
Posted by Rajesh Battala <ra...@citrix.com>.
Thanks Daan for pushing to 4.4
-----Original Message-----
From: Rajesh Battala [mailto:rajesh.battala@citrix.com]
Sent: Monday, May 12, 2014 2:14 PM
To: dev@cloudstack.apache.org
Subject: RE: cherry-pick requests
Daan,
I have fixed the issues and make a fix on 4.4 branch.
I have created a remote branch (hyper_vpc_patches) from 4.4 and my commit is on top of it.
Please cherry-pick this commit
4cb6c66f7568013586d0e66691aa10f9d34233ee
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=4cb6c66f7568013586d0e66691aa10f9d34233ee
Thanks
Rajesh Battala
-----Original Message-----
From: Daan Hoogland [mailto:daan.hoogland@gmail.com]
Sent: Sunday, May 11, 2014 2:57 PM
To: dev
Subject: Re: cherry-pick requests
Rajesh,
neither of then cherry-pick cleanly to 4.4 :(
sorry
On Sun, May 11, 2014 at 4:45 AM, Rajesh Battala <ra...@citrix.com> wrote:
> Hi Daan,
>
> I have fixed the ^M characters with this fix.
>
>
> please cherry-pick
> 1. cf41ccaa5b6475dace0bddbe6681c98cc5149189
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6c
> d1c7ab32a5e4ca3228b25aa6bd6158cb57963c CLOUDSTACK-6528
> SetupGuestNetwork command is not deleting the guest network configured
> on the eth device
>
> and then cherry pick
> 648a724dfc49222873124089464ccda92278fa9f
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=64
> 8a724dfc49222873124089464ccda92278fa9f
> which will solve line ending issues.
>
> Thanks
> Rajesh Battala
>
>
>
> -----Original Message-----
> From: Rajesh Battala [mailto:rajesh.battala@citrix.com]
> Sent: Monday, May 5, 2014 5:17 PM
> To: dev@cloudstack.apache.org
> Subject: RE: cherry-pick requests
>
> those are .cs files. As I was working with them on windows it could have got introduced.
> I will correct them and request for a new cherry-pick.
>
> Thanks
> Rajesh Battala
>
> -----Original Message-----
> From: Daan Hoogland [mailto:daan.hoogland@gmail.com]
> Sent: Monday, May 5, 2014 2:52 PM
> To: dev
> Subject: Re: cherry-pick requests
>
> cf41ccaa5b6475dace0bddbe6681c98cc5149189 is introducing ^M line endings. please make sure your env is clean. I hate to be nitpicking but can you fix/prevent this?
>
> I pushed the other two to wip-git.
>
> On Mon, May 5, 2014 at 10:44 AM, Rajesh Battala <ra...@citrix.com> wrote:
>> Hi Daan,
>>
>> Please cherry-pick these commits to 4.4 branch.
>>
>> 1 6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c
>>
>> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6
>> c d1c7ab32a5e4ca3228b25aa6bd6158cb57963c
>> CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest
>> network configured on the eth device
>>
>>
>> 2. cf41ccaa5b6475dace0bddbe6681c98cc5149189
>>
>> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=c
>> f
>> 41ccaa5b6475dace0bddbe6681c98cc5149189
>> CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in
>> VR/VpcVR to configure VPC entities
>>
>> 3. 144990df11b2d7eb2ece50a043aea26b9eddfdda
>> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=1
>> 4 4990df11b2d7eb2ece50a043aea26b9eddfdda
>> Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork
>> prepare command got changed
>>
>>
>> Thanks
>> Rajesh Battala
>
>
>
> --
> Daan
--
Daan
Re: cherry-pick requests
Posted by Daan Hoogland <da...@gmail.com>.
On Mon, May 12, 2014 at 10:44 AM, Rajesh Battala
<ra...@citrix.com> wrote:
> 4cb6c66f7568013586d0e66691aa10f9d34233ee
ok
--
Daan
RE: cherry-pick requests
Posted by Rajesh Battala <ra...@citrix.com>.
Daan,
I have fixed the issues and make a fix on 4.4 branch.
I have created a remote branch (hyper_vpc_patches) from 4.4 and my commit is on top of it.
Please cherry-pick this commit
4cb6c66f7568013586d0e66691aa10f9d34233ee
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=4cb6c66f7568013586d0e66691aa10f9d34233ee
Thanks
Rajesh Battala
-----Original Message-----
From: Daan Hoogland [mailto:daan.hoogland@gmail.com]
Sent: Sunday, May 11, 2014 2:57 PM
To: dev
Subject: Re: cherry-pick requests
Rajesh,
neither of then cherry-pick cleanly to 4.4 :(
sorry
On Sun, May 11, 2014 at 4:45 AM, Rajesh Battala <ra...@citrix.com> wrote:
> Hi Daan,
>
> I have fixed the ^M characters with this fix.
>
>
> please cherry-pick
> 1. cf41ccaa5b6475dace0bddbe6681c98cc5149189
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6c
> d1c7ab32a5e4ca3228b25aa6bd6158cb57963c CLOUDSTACK-6528
> SetupGuestNetwork command is not deleting the guest network configured
> on the eth device
>
> and then cherry pick
> 648a724dfc49222873124089464ccda92278fa9f
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=64
> 8a724dfc49222873124089464ccda92278fa9f
> which will solve line ending issues.
>
> Thanks
> Rajesh Battala
>
>
>
> -----Original Message-----
> From: Rajesh Battala [mailto:rajesh.battala@citrix.com]
> Sent: Monday, May 5, 2014 5:17 PM
> To: dev@cloudstack.apache.org
> Subject: RE: cherry-pick requests
>
> those are .cs files. As I was working with them on windows it could have got introduced.
> I will correct them and request for a new cherry-pick.
>
> Thanks
> Rajesh Battala
>
> -----Original Message-----
> From: Daan Hoogland [mailto:daan.hoogland@gmail.com]
> Sent: Monday, May 5, 2014 2:52 PM
> To: dev
> Subject: Re: cherry-pick requests
>
> cf41ccaa5b6475dace0bddbe6681c98cc5149189 is introducing ^M line endings. please make sure your env is clean. I hate to be nitpicking but can you fix/prevent this?
>
> I pushed the other two to wip-git.
>
> On Mon, May 5, 2014 at 10:44 AM, Rajesh Battala <ra...@citrix.com> wrote:
>> Hi Daan,
>>
>> Please cherry-pick these commits to 4.4 branch.
>>
>> 1 6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c
>>
>> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6
>> c d1c7ab32a5e4ca3228b25aa6bd6158cb57963c
>> CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest
>> network configured on the eth device
>>
>>
>> 2. cf41ccaa5b6475dace0bddbe6681c98cc5149189
>>
>> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=c
>> f
>> 41ccaa5b6475dace0bddbe6681c98cc5149189
>> CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in
>> VR/VpcVR to configure VPC entities
>>
>> 3. 144990df11b2d7eb2ece50a043aea26b9eddfdda
>> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=1
>> 4 4990df11b2d7eb2ece50a043aea26b9eddfdda
>> Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork
>> prepare command got changed
>>
>>
>> Thanks
>> Rajesh Battala
>
>
>
> --
> Daan
--
Daan
Re: cherry-pick requests
Posted by Daan Hoogland <da...@gmail.com>.
Rajesh,
neither of then cherry-pick cleanly to 4.4 :(
sorry
On Sun, May 11, 2014 at 4:45 AM, Rajesh Battala
<ra...@citrix.com> wrote:
> Hi Daan,
>
> I have fixed the ^M characters with this fix.
>
>
> please cherry-pick
> 1. cf41ccaa5b6475dace0bddbe6681c98cc5149189
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest network configured on the eth device
>
> and then cherry pick
> 648a724dfc49222873124089464ccda92278fa9f
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=648a724dfc49222873124089464ccda92278fa9f
> which will solve line ending issues.
>
> Thanks
> Rajesh Battala
>
>
>
> -----Original Message-----
> From: Rajesh Battala [mailto:rajesh.battala@citrix.com]
> Sent: Monday, May 5, 2014 5:17 PM
> To: dev@cloudstack.apache.org
> Subject: RE: cherry-pick requests
>
> those are .cs files. As I was working with them on windows it could have got introduced.
> I will correct them and request for a new cherry-pick.
>
> Thanks
> Rajesh Battala
>
> -----Original Message-----
> From: Daan Hoogland [mailto:daan.hoogland@gmail.com]
> Sent: Monday, May 5, 2014 2:52 PM
> To: dev
> Subject: Re: cherry-pick requests
>
> cf41ccaa5b6475dace0bddbe6681c98cc5149189 is introducing ^M line endings. please make sure your env is clean. I hate to be nitpicking but can you fix/prevent this?
>
> I pushed the other two to wip-git.
>
> On Mon, May 5, 2014 at 10:44 AM, Rajesh Battala <ra...@citrix.com> wrote:
>> Hi Daan,
>>
>> Please cherry-pick these commits to 4.4 branch.
>>
>> 1 6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c
>>
>> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6c
>> d1c7ab32a5e4ca3228b25aa6bd6158cb57963c
>> CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest
>> network configured on the eth device
>>
>>
>> 2. cf41ccaa5b6475dace0bddbe6681c98cc5149189
>>
>> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=cf
>> 41ccaa5b6475dace0bddbe6681c98cc5149189
>> CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in
>> VR/VpcVR to configure VPC entities
>>
>> 3. 144990df11b2d7eb2ece50a043aea26b9eddfdda
>> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=14
>> 4990df11b2d7eb2ece50a043aea26b9eddfdda
>> Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork prepare
>> command got changed
>>
>>
>> Thanks
>> Rajesh Battala
>
>
>
> --
> Daan
--
Daan
RE: cherry-pick requests
Posted by Rajesh Battala <ra...@citrix.com>.
Hi Daan,
I have fixed the ^M characters with this fix.
please cherry-pick
1. cf41ccaa5b6475dace0bddbe6681c98cc5149189
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest network configured on the eth device
and then cherry pick
648a724dfc49222873124089464ccda92278fa9f
https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=648a724dfc49222873124089464ccda92278fa9f
which will solve line ending issues.
Thanks
Rajesh Battala
-----Original Message-----
From: Rajesh Battala [mailto:rajesh.battala@citrix.com]
Sent: Monday, May 5, 2014 5:17 PM
To: dev@cloudstack.apache.org
Subject: RE: cherry-pick requests
those are .cs files. As I was working with them on windows it could have got introduced.
I will correct them and request for a new cherry-pick.
Thanks
Rajesh Battala
-----Original Message-----
From: Daan Hoogland [mailto:daan.hoogland@gmail.com]
Sent: Monday, May 5, 2014 2:52 PM
To: dev
Subject: Re: cherry-pick requests
cf41ccaa5b6475dace0bddbe6681c98cc5149189 is introducing ^M line endings. please make sure your env is clean. I hate to be nitpicking but can you fix/prevent this?
I pushed the other two to wip-git.
On Mon, May 5, 2014 at 10:44 AM, Rajesh Battala <ra...@citrix.com> wrote:
> Hi Daan,
>
> Please cherry-pick these commits to 4.4 branch.
>
> 1 6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c
>
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6c
> d1c7ab32a5e4ca3228b25aa6bd6158cb57963c
> CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest
> network configured on the eth device
>
>
> 2. cf41ccaa5b6475dace0bddbe6681c98cc5149189
>
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=cf
> 41ccaa5b6475dace0bddbe6681c98cc5149189
> CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in
> VR/VpcVR to configure VPC entities
>
> 3. 144990df11b2d7eb2ece50a043aea26b9eddfdda
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=14
> 4990df11b2d7eb2ece50a043aea26b9eddfdda
> Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork prepare
> command got changed
>
>
> Thanks
> Rajesh Battala
--
Daan
RE: cherry-pick requests
Posted by Rajesh Battala <ra...@citrix.com>.
those are .cs files. As I was working with them on windows it could have got introduced.
I will correct them and request for a new cherry-pick.
Thanks
Rajesh Battala
-----Original Message-----
From: Daan Hoogland [mailto:daan.hoogland@gmail.com]
Sent: Monday, May 5, 2014 2:52 PM
To: dev
Subject: Re: cherry-pick requests
cf41ccaa5b6475dace0bddbe6681c98cc5149189 is introducing ^M line endings. please make sure your env is clean. I hate to be nitpicking but can you fix/prevent this?
I pushed the other two to wip-git.
On Mon, May 5, 2014 at 10:44 AM, Rajesh Battala <ra...@citrix.com> wrote:
> Hi Daan,
>
> Please cherry-pick these commits to 4.4 branch.
>
> 1 6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c
>
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6c
> d1c7ab32a5e4ca3228b25aa6bd6158cb57963c
> CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest
> network configured on the eth device
>
>
> 2. cf41ccaa5b6475dace0bddbe6681c98cc5149189
>
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=cf
> 41ccaa5b6475dace0bddbe6681c98cc5149189
> CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in
> VR/VpcVR to configure VPC entities
>
> 3. 144990df11b2d7eb2ece50a043aea26b9eddfdda
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=14
> 4990df11b2d7eb2ece50a043aea26b9eddfdda
> Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork prepare
> command got changed
>
>
> Thanks
> Rajesh Battala
--
Daan
Re: cherry-pick requests
Posted by Daan Hoogland <da...@gmail.com>.
cf41ccaa5b6475dace0bddbe6681c98cc5149189 is introducing ^M line
endings. please make sure your env is clean. I hate to be nitpicking
but can you fix/prevent this?
I pushed the other two to wip-git.
On Mon, May 5, 2014 at 10:44 AM, Rajesh Battala
<ra...@citrix.com> wrote:
> Hi Daan,
>
> Please cherry-pick these commits to 4.4 branch.
>
> 1 6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=6cd1c7ab32a5e4ca3228b25aa6bd6158cb57963c
> CLOUDSTACK-6528 SetupGuestNetwork command is not deleting the guest network configured on the eth device
>
>
> 2. cf41ccaa5b6475dace0bddbe6681c98cc5149189
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=cf41ccaa5b6475dace0bddbe6681c98cc5149189
> CLOUDSTACK-6518 [Hyper-V] Efficient way of finding the empty nic in VR/VpcVR to configure VPC entities
>
> 3. 144990df11b2d7eb2ece50a043aea26b9eddfdda
> https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=144990df11b2d7eb2ece50a043aea26b9eddfdda
> Fixed testSetupGuestNetwork unit test as the SetupGuestnetwork prepare command got changed
>
>
> Thanks
> Rajesh Battala
--
Daan