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.batt...@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.hoogl...@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 <rajesh.batt...@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
