[ACS44] Cherry pick Request

2014-06-23 Thread Anshul Gangwar
Hi Daan/Hugo,



Can you please cherry-pick following commits from 4.4-forward to 4.4:


commit ef45f06f88c955dcf47f1fb69a3a0e87eb817e1d
Author: Anshul Gangwar anshul.gang...@citrix.com
Date:   Mon Jun 23 10:58:44 2014 +0530

CLOUDSTACK-6965: fixed the NullPointerException introduced by fix for 
cloudstack
6935 in AbstractStoragePoolAllocator#filter method for Zone Wide storage


commit e7ba46b5f7da21c4fc13dc3284aa802d177045f2
Author: Anshul Gangwar anshul.gang...@citrix.com
Date:   Fri Jun 20 16:35:06 2014 +0530

CLOUDSTACK-6968: Allowing cluster scope volumes to attach to any VM. If 
migration is
needed then first they will be migrated to appropriate cluster before 
attaching.

commit 64153a43711420224655bfbe248b4b87474a1f23
Author: Anshul Gangwar anshul.gang...@citrix.com
Date:   Fri Jun 20 14:32:05 2014 +0530

CLOUDSTACK-6830: Fixed [hyper-v] during VM migration, volumes on zone wide 
primary
store requires storage migration resulting in failure of VM migration. This 
also
improves the hostsformigration api. Firstly we were trying to list all 
hosts and
then finding suitable storage pools for all volumes and then we were 
checking
whether vm migration requires storage migration to that host. Now the 
process is
updated. We are checking for only those volumes which are not in zone wide 
primary
store. We are verifying by comparing volumes-poolid-clusterid to host 
clusterid.
If it uses local or clusterids are different then verifying whether host has
suitable storage pools for the volume of the vm to be migrated too.

Thanks,
Anshul



Re: [ACS44] Cherry pick Request

2014-06-23 Thread Daan Hoogland
On Mon, Jun 23, 2014 at 9:43 AM, Anshul Gangwar
anshul.gang...@citrix.com wrote:
...
 commit ef45f06f88c955dcf47f1fb69a3a0e87eb817e1d
is in

 commit e7ba46b5f7da21c4fc13dc3284aa802d177045f2
is in

 commit 64153a43711420224655bfbe248b4b87474a1f23
conflicts, will have a look in a minute


Re: [ACS44] Cherry pick Request

2014-06-23 Thread Daan Hoogland
On Mon, Jun 23, 2014 at 9:52 AM, Daan Hoogland daan.hoogl...@gmail.com wrote:
 commit 64153a43711420224655bfbe248b4b87474a1f23
 conflicts, will have a look in a minute


seemed simple, please check

-- 
Daan


RE: [ACS44] Cherry pick Request

2014-06-23 Thread Anshul Gangwar
Looks good 

-Original Message-
From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] 
Sent: Monday, June 23, 2014 1:27 PM
To: Anshul Gangwar
Cc: dev@cloudstack.apache.org
Subject: Re: [ACS44] Cherry pick Request

On Mon, Jun 23, 2014 at 9:52 AM, Daan Hoogland daan.hoogl...@gmail.com wrote:
 commit 64153a43711420224655bfbe248b4b87474a1f23
 conflicts, will have a look in a minute


seemed simple, please check

-- 
Daan


Re: [ACS44] Cherry pick Request

2014-06-23 Thread Daan Hoogland
except that it doesn't build :( this seems to be related to the
libvirt pom again, not your commit :)

On Mon, Jun 23, 2014 at 10:16 AM, Anshul Gangwar
anshul.gang...@citrix.com wrote:
 Looks good

 -Original Message-
 From: Daan Hoogland [mailto:daan.hoogl...@gmail.com]
 Sent: Monday, June 23, 2014 1:27 PM
 To: Anshul Gangwar
 Cc: dev@cloudstack.apache.org
 Subject: Re: [ACS44] Cherry pick Request

 On Mon, Jun 23, 2014 at 9:52 AM, Daan Hoogland daan.hoogl...@gmail.com 
 wrote:
 commit 64153a43711420224655bfbe248b4b87474a1f23
 conflicts, will have a look in a minute


 seemed simple, please check

 --
 Daan



-- 
Daan


[ACS44] cherry-pick request

2014-06-19 Thread Murali Reddy
Please cherry-pick below commit in 4.4-forward into 4.4

commit d8cbba1bc616d43e218229a2807915c1b21569dc

CLOUDSTACK-6750: [OVS] With stretched network deploying vm in a ovs
disabled zone does not fail



Re: [ACS44] cherry-pick request

2014-06-19 Thread Daan Hoogland
On Thu, Jun 19, 2014 at 2:22 PM, Murali Reddy murali.re...@citrix.com wrote:
 d8cbba1bc616d43e218229a2807915c1b21569dc


is in

-- 
Daan


Re: [ACS44] Cherry pick request

2014-06-17 Thread Daan Hoogland
On Mon, Jun 16, 2014 at 11:31 PM, Amogh Vasekar
amogh.vase...@citrix.com wrote:
 de04881da177b28d7cb3efc09adb2d8069f0fdd3


is in

-- 
Daan


RE: [ACS44] Cherry Pick Request

2014-06-17 Thread Santhosh Edukulla
Resolved the conflicts for the mentioned commit.

https://reviews.apache.org/r/22677/

Santhosh

From: Daan Hoogland [daan.hoogl...@gmail.com]
Sent: Monday, June 16, 2014 12:09 PM
To: dev
Subject: Re: [ACS44] Cherry Pick Request

On Mon, Jun 16, 2014 at 4:28 PM, Santhosh Edukulla
santhosh.eduku...@citrix.com wrote:
 Daan,

 Please pick up the below fixes for resource leaks and other Coverity issues.

 4ba3aae2ea0290ca012623083e13625e08a9dde5
was in already?

 3c5f64c97ab071451aee7f232d8f2cec6d89044d
in

 dbfce8b11e25855a8cb21ec2bbbfe20940bb788d
had conflicts



 As well, please check the below commit, its fix for CLOUDSTACK-6793

 91d054cb00f6a5818f2be1c7e4d3f44a2c58bfcc
was in already?


 Thanks!
 Santhosh



--
Daan

Re: [ACS44] Cherry Pick Request

2014-06-17 Thread Daan Hoogland
applied and pushed,

I have one remark; when fixing issues I would like to see a ref to the
issue (in this case no jira issue but 'coverity:') and a description
of what was solved. your style of commit comments requires a lot of
contextual knowledge. Can you try to make sure someone reading your
commit comment doesn't need to know the contents of the related issues
to get it?

thanks,
Daan

On Tue, Jun 17, 2014 at 1:26 PM, Santhosh Edukulla
santhosh.eduku...@citrix.com wrote:
 Resolved the conflicts for the mentioned commit.

 https://reviews.apache.org/r/22677/

 Santhosh
 
 From: Daan Hoogland [daan.hoogl...@gmail.com]
 Sent: Monday, June 16, 2014 12:09 PM
 To: dev
 Subject: Re: [ACS44] Cherry Pick Request

 On Mon, Jun 16, 2014 at 4:28 PM, Santhosh Edukulla
 santhosh.eduku...@citrix.com wrote:
 Daan,

 Please pick up the below fixes for resource leaks and other Coverity issues.

 4ba3aae2ea0290ca012623083e13625e08a9dde5
 was in already?

 3c5f64c97ab071451aee7f232d8f2cec6d89044d
 in

 dbfce8b11e25855a8cb21ec2bbbfe20940bb788d
 had conflicts



 As well, please check the below commit, its fix for CLOUDSTACK-6793

 91d054cb00f6a5818f2be1c7e4d3f44a2c58bfcc
 was in already?


 Thanks!
 Santhosh



 --
 Daan



-- 
Daan


RE: [ACS44] Cherry Pick Request

2014-06-17 Thread Santhosh Edukulla
Sure.

From: Daan Hoogland [daan.hoogl...@gmail.com]
Sent: Tuesday, June 17, 2014 7:55 AM
To: dev
Subject: Re: [ACS44] Cherry Pick Request

applied and pushed,

I have one remark; when fixing issues I would like to see a ref to the
issue (in this case no jira issue but 'coverity:') and a description
of what was solved. your style of commit comments requires a lot of
contextual knowledge. Can you try to make sure someone reading your
commit comment doesn't need to know the contents of the related issues
to get it?

thanks,
Daan

On Tue, Jun 17, 2014 at 1:26 PM, Santhosh Edukulla
santhosh.eduku...@citrix.com wrote:
 Resolved the conflicts for the mentioned commit.

 https://reviews.apache.org/r/22677/

 Santhosh
 
 From: Daan Hoogland [daan.hoogl...@gmail.com]
 Sent: Monday, June 16, 2014 12:09 PM
 To: dev
 Subject: Re: [ACS44] Cherry Pick Request

 On Mon, Jun 16, 2014 at 4:28 PM, Santhosh Edukulla
 santhosh.eduku...@citrix.com wrote:
 Daan,

 Please pick up the below fixes for resource leaks and other Coverity issues.

 4ba3aae2ea0290ca012623083e13625e08a9dde5
 was in already?

 3c5f64c97ab071451aee7f232d8f2cec6d89044d
 in

 dbfce8b11e25855a8cb21ec2bbbfe20940bb788d
 had conflicts



 As well, please check the below commit, its fix for CLOUDSTACK-6793

 91d054cb00f6a5818f2be1c7e4d3f44a2c58bfcc
 was in already?


 Thanks!
 Santhosh



 --
 Daan



--
Daan


Re: [ACS44] cherry-pick request

2014-06-17 Thread Daan Hoogland
On Tue, Jun 17, 2014 at 2:26 PM, Murali Reddy murali.re...@citrix.com wrote:
 8ca8a7217ec155a37b24e3d9cfc3d5fc67adef2d


is in

-- 
Daan


[ACS44] cherry-pick request

2014-06-17 Thread Murali Reddy

Daan, please cherry-pick below commit in 4.4-forward into 4.4

commit 8ca8a7217ec155a37b24e3d9cfc3d5fc67adef2d
CLOUDSTACK-6925: [OVS] get rid custom logic to create bridges on hosts
in the XenServer pool for GRE tunnel networks


Fix uses XenServer recommended way
Network.other_config:assume_network_is_shared=true
which ensures bridge is created automatically on hosts in the pool for
GRE tunnel networks. Fix also gets rid of  error prone custom logic
that ensures
bridge is created by plugging a VIF into the dom0 and connected to
GRE tunnel network.



[ACS44] Cherry Pick Request

2014-06-16 Thread Santhosh Edukulla
Daan,

Please pick up the below fixes for resource leaks and other Coverity issues.

4ba3aae2ea0290ca012623083e13625e08a9dde5
3c5f64c97ab071451aee7f232d8f2cec6d89044d
dbfce8b11e25855a8cb21ec2bbbfe20940bb788d


As well, please check the below commit, its fix for CLOUDSTACK-6793

91d054cb00f6a5818f2be1c7e4d3f44a2c58bfcc

Thanks!
Santhosh

Re: [ACS44] Cherry Pick Request

2014-06-16 Thread Daan Hoogland
On Mon, Jun 16, 2014 at 4:28 PM, Santhosh Edukulla
santhosh.eduku...@citrix.com wrote:
 Daan,

 Please pick up the below fixes for resource leaks and other Coverity issues.

 4ba3aae2ea0290ca012623083e13625e08a9dde5
was in already?

 3c5f64c97ab071451aee7f232d8f2cec6d89044d
in

 dbfce8b11e25855a8cb21ec2bbbfe20940bb788d
had conflicts



 As well, please check the below commit, its fix for CLOUDSTACK-6793

 91d054cb00f6a5818f2be1c7e4d3f44a2c58bfcc
was in already?


 Thanks!
 Santhosh



-- 
Daan


[ACS44] Cherry pick request

2014-06-16 Thread Amogh Vasekar
Hi Daan,

Can you please cherry-pick de04881da177b28d7cb3efc09adb2d8069f0fdd3 from
4.4-forward to 4.4?

This fixes CLOUDSTACK-6915

Thanks,
Amogh



[ACS44] cherry-pick request

2014-06-13 Thread Murali Reddy
Daan, 

Please cherry-pick below commits in 4.4-forward into 4.4

commit be937a08213f06a801cf07d19867d48dad35d19f
CLOUDSTACK-6832: [OVS]vnet is not released even the network is deleted

fix ensures allocated VNET is released during network shutdown

commit 9dfbdb5ffd2f0981651bc98f1c5d71718a24a29f
CLOUDSTACK-6749: [OVS] xe network-param-get with
param-key=is-ovs-vpc-distributed-vr-network alway returns error

fixing unnecessary errors in the logs


Thanks.



Re: [ACS44] cherry-pick request

2014-06-13 Thread Daan Hoogland
both pulled

On Fri, Jun 13, 2014 at 1:53 PM, Murali Reddy murali.re...@citrix.com wrote:
 Daan,

 Please cherry-pick below commits in 4.4-forward into 4.4

 commit be937a08213f06a801cf07d19867d48dad35d19f
 CLOUDSTACK-6832: [OVS]vnet is not released even the network is deleted

 fix ensures allocated VNET is released during network shutdown

 commit 9dfbdb5ffd2f0981651bc98f1c5d71718a24a29f
 CLOUDSTACK-6749: [OVS] xe network-param-get with
 param-key=is-ovs-vpc-distributed-vr-network alway returns error

 fixing unnecessary errors in the logs


 Thanks.




-- 
Daan


Re: [ACS44] Cherry pick request

2014-06-12 Thread Daan Hoogland
3 in

On Thu, Jun 12, 2014 at 6:58 AM, Saksham Srivastava
saksham.srivast...@citrix.com wrote:
 Hi Daan,

 Request you to cherry-pick the following commits to 4.4:

 c5ee5ad5c828d9f0b128e3d7280a30dcf717e045   -   CLOUDSTACK-6864
 5bcd017de6f421a6125406120b39fb8602276dc7   -CLOUDSTACK-6654
 f14f36170e94c0184ade28a50226b17d25ecf57c-CLOUDSTACK-6812

 Thanks,
 Saksham



-- 
Daan


[ACS44] Cherry pick request

2014-06-11 Thread Saksham Srivastava
Hi Daan,

Request you to cherry-pick the following commits to 4.4:

c5ee5ad5c828d9f0b128e3d7280a30dcf717e045   -   CLOUDSTACK-6864
5bcd017de6f421a6125406120b39fb8602276dc7   -CLOUDSTACK-6654
f14f36170e94c0184ade28a50226b17d25ecf57c-CLOUDSTACK-6812

Thanks,
Saksham


Re: [ACS44] Cherry pick request

2014-06-10 Thread Daan Hoogland
2 picked

On Tue, Jun 10, 2014 at 2:09 AM, Amogh Vasekar amogh.vase...@citrix.com wrote:
 Hi Daan,

 Request you to please cherry-pick the following two commits to 4.4 branch :

 1. ac92b3690304ff224e7e2530ea7d8e39f28a05c3 for CLOUDSTACK-6710
 2. a4b401f29f83f2f0b467a9d05b509f951b5a3bca for CLOUDSTACK-6358

 Thanks,
 Amogh




-- 
Daan


[ACS44] Cherry pick request

2014-06-09 Thread Amogh Vasekar
Hi Daan,

Request you to please cherry-pick the following two commits to 4.4 branch :

1. ac92b3690304ff224e7e2530ea7d8e39f28a05c3 for CLOUDSTACK-6710
2. a4b401f29f83f2f0b467a9d05b509f951b5a3bca for CLOUDSTACK-6358

Thanks,
Amogh



[ACS44] Cherry pick request

2014-05-14 Thread Amogh Vasekar
Hi Daan,

Can you please cherry-pick 594f66d12521c6a3a07475e37e7ab0f09d247b19
It is a fix for https://issues.apache.org/jira/browse/CLOUDSTACK-6437

Thanks,
Amogh



Re: [ACS44] Cherry pick request

2014-05-13 Thread Daan Hoogland
ok

On Tue, May 13, 2014 at 7:13 PM, Amogh Vasekar amogh.vase...@citrix.com wrote:
 Hi Daan,

 Can you please cherry-pick 594f66d12521c6a3a07475e37e7ab0f09d247b19
 It is a fix for https://issues.apache.org/jira/browse/CLOUDSTACK-6437

 Thanks,
 Amogh




-- 
Daan


[ACS44] Cherry-pick request for CLOUDSTACK-6351

2014-05-02 Thread Yoshikazu Nojima
Hi Daan or Hugo,

Could you please cherry-pick fa4e7fc7f75c7cf6065b2e97e1d27c942c9a73af
into the 4.4 branch?

This patch fixes CLOUDSTACK-6351  java6 is installed instead of java7
when CloudStack rpm is installed.

I confirmed it successfully resolves dependency and installs java-1.7.0-openjdk.

Thanks,
Noji


Re: [ACS44] Cherry-pick request for CLOUDSTACK-6351

2014-05-02 Thread Daan Hoogland
On Fri, May 2, 2014 at 8:43 AM, Yoshikazu Nojima m...@ynojima.net wrote:
 fa4e7fc7f75c7cf6065b2e97e1d27c942c9a73af


Noji, this doesn't apply. It seems because the 4.4 version of the file
still uses the epoch in the 'requires' line for java.
I pulled in Rajesh commit d55bf1efaeab6665f7c50c5b62442b0d9da0a242 so
the end result is the same

-- 
Daan


[ACS44][cherry-pick request]Bugfix: Retired maven repo breaking awsapi build and RPM packaging

2014-04-21 Thread Yoshikazu Nojima
Daan or Hugo,

Could you cherry-pick following commit to 4.4 branch?

756f48f9105b5b95277268fc3ab554ee182e1f47

https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=756f48f9105b5b95277268fc3ab554ee182e1f47

This commit will fix the mvn package resolution trouble.
https://issues.apache.org/jira/browse/CLOUDSTACK-6156

The reason why we don't face this trouble in jenkins.buildacloud.org
is we've done following quick fix.
http://mail-archives.apache.org/mod_mbox/cloudstack-users/201310.mbox/0a3001ced4db$ad790940$086b1bc0$@uplink.ua

Regards,
Noji


Re: [ACS44][cherry-pick request]Bugfix: Retired maven repo breaking awsapi build and RPM packaging

2014-04-21 Thread Daan Hoogland
done.

On Mon, Apr 21, 2014 at 7:27 PM, Yoshikazu Nojima m...@ynojima.net wrote:
 Daan or Hugo,

 Could you cherry-pick following commit to 4.4 branch?

 756f48f9105b5b95277268fc3ab554ee182e1f47

 https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=756f48f9105b5b95277268fc3ab554ee182e1f47

 This commit will fix the mvn package resolution trouble.
 https://issues.apache.org/jira/browse/CLOUDSTACK-6156

 The reason why we don't face this trouble in jenkins.buildacloud.org
 is we've done following quick fix.
 http://mail-archives.apache.org/mod_mbox/cloudstack-users/201310.mbox/0a3001ced4db$ad790940$086b1bc0$@uplink.ua

 Regards,
 Noji



-- 
Daan