[ACS4.4, Cherry Pick]

2014-04-21 Thread Mike Tutkowski
Hi Daan, Could you please cherry pick 68992c8f7391acf623efbe9159807789a7ebfe1e from 4.4-forward to 4.4? It contains changes to enable proper cleanup of a VMware datastore that was hosting the root volume of a VM that is no longer needed by managed storage. Thanks! -- *Mike Tutkowski* *Senior C

[ACS4.4] cherry pick

2014-04-24 Thread Rajani Karuturi
Hi Daan, Can you cherry-pick the following two commits from 4.4-forward to 4.4? f7f84fba89cf9eea856075d45bf623ff9ed7a632 checkstyle fix for commit 8e2e8e5e8ab492fa40dedc0788c0ac61f912487b 8e2e8e5e8ab492fa40dedc0788c0ac61f912487b improved ldap logging. added stacktrace in debug level incase of

[ACS4.4] Cherry pick

2014-05-02 Thread Mike Tutkowski
Hi Daan, Could you please cherry pick 0cdcab26f5636ed4de2d1c26a6606f85f935f6da to 4.4? It contains changes to fix an issue related to the "Reinstall VM" command and managed storage with VMware. Thanks! -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfir

[ACS4.4] cherry-pick

2014-05-26 Thread Jayapal Reddy Uradi
Hi Daan, Please cherry-pick the following commits to 4.4. commit 37a3a65c7c7f083a5536c078a1c8436ef9e14597 Author: Jayapal Date: Mon May 26 15:10:35 2014 +0530 CLOUDSTACK-6761: Fixed removing proxy arp rule on deleting static nat or PF rule on ip commit 587ee544f2d8223599e5ee8c56f926ebf78

[ACS4.4] Cherry-pick

2014-06-18 Thread Rajesh Battala
Daan, Request to cherry-pick 21e452ff4f0459422f0612f2ddf7033a963b0a19 Thanks Rajesh Battala

Re: [ACS4.4, Cherry Pick]

2014-04-22 Thread Daan Hoogland
On Tue, Apr 22, 2014 at 6:18 AM, Mike Tutkowski wrote: > 68992c8f7391acf623efbe9159807789a7ebfe1e done -- Daan

Re: [ACS4.4, Cherry Pick]

2014-04-22 Thread Mike Tutkowski
Thanks, Daan! I noticed the comment was altered to specify "[DB-CHANGE]". That's a bit confusing to me as there is no change in the DB for this commit. Talk to you later! Mike On Tue, Apr 22, 2014 at 2:07 AM, Daan Hoogland wrote: > On Tue, Apr 22, 2014 at 6:18 AM, Mike Tutkowski > wrote: > >

Re: [ACS4.4, Cherry Pick]

2014-04-22 Thread Daan Hoogland
I removed my commit hook when i raad it. Sorry mobile bilingual spell checker used Op 22 apr. 2014 20:35 schreef "Mike Tutkowski" : > Thanks, Daan! > > I noticed the comment was altered to specify "[DB-CHANGE]". > > That's a bit confusing to me as there is no change in the DB for this > commit. >

[ACS4.4] Cherry pick 54c0df56dc03d20ef1d9804d8695c3f6584470f8

2014-04-23 Thread Mike Tutkowski
Hi Daan, Could you please cherry pick 54c0df56dc03d20ef1d9804d8695c3f6584470f8 to 4.4 for JIRA ticket 6488? This is a fix for a VMware issue I noticed where the "path" field was not being updated in the volumes table correctly when a snapshot was being taken. Thanks! -- *Mike Tutkowski* *Senior

[ACS4.4] Cherry pick 6dfa742eb8d6b775317829636bfa28f0ec297242

2014-04-25 Thread Mike Tutkowski
Hi Daan, Please cherry pick 6dfa742eb8d6b775317829636bfa28f0ec297242 to 4.4. It contains logic to help calculate the allocated space of a managed storage pool more accurately. Thanks! -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7

Re: [ACS4.4] cherry pick

2014-04-25 Thread Daan Hoogland
On Thu, Apr 24, 2014 at 2:30 PM, Rajani Karuturi wrote: > f7f84fba89cf9eea856075d45bf623ff9ed7a632 doesn't apply cleanly -- Daan

Re: [ACS4.4] cherry pick

2014-04-25 Thread Daan Hoogland
8e2e8e5e8ab492fa40dedc0788c0ac61f912487b picked On Fri, Apr 25, 2014 at 9:48 PM, Daan Hoogland wrote: > On Thu, Apr 24, 2014 at 2:30 PM, Rajani Karuturi > wrote: >> f7f84fba89cf9eea856075d45bf623ff9ed7a632 > > > doesn't apply cleanly > > -- > Daan -- Daan

Re: [ACS4.4] cherry pick

2014-04-25 Thread Daan Hoogland
Rajani, I guess I did not understand your mail. I applied the first mentioned/second applied patch and it is pushed. 2014-04-25 22:27 GMT+02:00 Daan Hoogland : > 8e2e8e5e8ab492fa40dedc0788c0ac61f912487b > > picked > > On Fri, Apr 25, 2014 at 9:48 PM, Daan Hoogland > wrote: >> On Thu, Apr 24, 201

[ACS4.4] Cherry pick 7694bee83f53a16537032bed3902ef8b4f95c4ab

2014-04-25 Thread Amogh Vasekar
Hi Daan / Hugo, Can you please cherry pick commit 7694bee83f53a16537032bed3902ef8b4f95c4ab This is to fix https://issues.apache.org/jira/browse/CLOUDSTACK-6516 Thanks, Amogh

Re: [ACS4.4] cherry pick

2014-04-27 Thread Rajani Karuturi
Hi Daan, The actual commit was 8e2e8e5e8ab492fa40dedc0788c0ac61f912487b. However there were some check style issues(tab spacing related) as the commit was originally created for 4.3 Those were fixed in the commit f7f84fba89cf9eea856075d45bf623ff9ed7a632 The request was to cherry-pick both the co

[ACS4.4] Cherry pick 934056097a638c1563f067b4236ad4c37211e9db

2014-04-28 Thread Mike Tutkowski
Hi Daan, Please cherry pick 934056097a638c1563f067b4236ad4c37211e9db to 4.4. Thanks! -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud *

[ACS4.4] cherry-pick 08ec6ebddaf5a5cddab2be8dfcebf75b91dafa92

2014-04-29 Thread Rajani Karuturi
Hi Daan, Can you cherry-pick the below commit from 4.4-forward to 4.4? Commit: 08ec6ebddaf5a5cddab2be8dfcebf75b91dafa92 Fixed CLOUDSTACK-6509 Cannot import multiple LDAP/AD users into a cloudstack account ~Rajani

Re: [ACS4.4] Cherry pick

2014-05-03 Thread Daan Hoogland
On Sat, May 3, 2014 at 2:35 AM, Mike Tutkowski wrote: > 0cdcab26f5636ed4de2d1c26a6606f85f935f6da done -- Daan

[ACS4.4] cherry pick commit

2014-05-15 Thread Nitin Mehta
Hi Hugo/Daan, Please cherry-pick the following into 4.4. commit 076bbdcfe86d6886ab1ecfc513b02a323a995307 CLOUDSTACK-6660: Dont assume every vm will have a root volume now. Thanks, -Nitin

[ACS4.4] Cherry-pick d5425e1a4a8ed4cadc2f9b97f82f6f608e9a51de

2014-05-18 Thread Nitin Mehta
Hi Daan, Can you please cherry-pick the following commit d5425e1a4a8ed4cadc2f9b97f82f6f608e9a51de in 4.4 for CLOUDSTACK-6699 ? Thanks, -Nitin

[ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043

2014-05-19 Thread Min Chen
Hi Daan, As we proposed earlier in community, since IAM feature is not ready for 4.4 release due to backwards compatibility issue, we need to disable IAM on 4.4. I have checked in commit f748a552e9546e91e18c574b375f3ea6c8d7e043 on 4.4-forward to disable IAM, would you please cherry-pick this c

[ACS4.4] Cherry-pick e3bb8b98bd9055115004da2ec67b29271a3974c5

2014-05-21 Thread Kelven Yang
There is an typo on the bug id, it should be the fix for CLOUDSTACK-6743 commit e3bb8b98bd9055115004da2ec67b29271a3974c5 Author: Kelven Yang Date: Wed May 21 16:14:14 2014 -0700 CLOUDSTACK-5485: Use edge-triggering in MessageDetector to handle bogus wakeup gracefully. Level triggering plus

[ACS4.4] Cherry-pick 356f6121a78d147d72136044c90472234f667730

2014-05-21 Thread Min Chen
Hi Daan, Can you please cherry-pick this commit from 4.4-forward to 4.4? Commit: 356f6121a78d147d72136044c90472234f667730 CLOUDSTACK-6742: listVolumes - As regularuser , able to list Vms and volumes of other users. Thanks -min

[ACS4.4] Cherry pick request

2014-05-22 Thread Amogh Vasekar
Hi Daan, Can you please cherry pick 7bbad0491f7ec087f693814caadbe6d648d2edf2 It resolves CLOUDSTACK-6671 Thanks, Amogh

[ACS4.4] Cherry-pick 0d243ec7f2e1a0e3508d385f7b793b103c56ca07

2014-05-22 Thread Min Chen
Hi Daan, Would you please cherry pick the following commit from 4.4-forward branch to 4.4 branch? Commit: 0d243ec7f2e1a0e3508d385f7b793b103c56ca07 CLOUDSTACK-6745:DomainAdmin is not able to deploy Vm for users in his domain/subdomain. Thanks -min

[ACS4.4] Cherry-pick da5ad74d5f4388c4aa1df2f2e5f9053bfb70d83d

2014-05-22 Thread Min Chen
Hi Daan, Would you please cherry-pick the following commit from 4.4-forward to 4.4? Commit: da5ad74d5f4388c4aa1df2f2e5f9053bfb70d83d CLOUDSTACK-6752: IAM command class separation caused ApiDoc warning of duplicated cmd class for the same api name. Thanks

[ACS4.4] Cherry pick d5fbcafc2ff04e665c2ec8079c759fe4cabf9d1a

2014-05-23 Thread Min Chen
Hi Daan, Can you please cherry-pick commit d5fbcafc2ff04e665c2ec8079c759fe4cabf9d1a from 4.4-forward to 4.4 branch? This commit removes windows line ending from IAMService.java. Thanks -min

Re: [ACS4.4] cherry-pick

2014-05-27 Thread Daan Hoogland
two pulled, please note two managerial issues in the one by Saurav: a trailing space behind the fi in systemvm/scripts/run.sh a new shell script without license header: systemvm/scripts/utils.sh regards On Tue, May 27, 2014 at 7:34 AM, Jayapal Reddy Uradi wrote: > Hi Daan, > > Please cherry-pic

Re: [ACS4.4] cherry-pick

2014-05-27 Thread Jayapal Reddy Uradi
Hi Daan, The two issue fixed in below commit, please cherry-pick it to 4.4 c535b894840e1a625186f7c62796e80950293221 Thanks, Jayapal On 27-May-2014, at 2:12 PM, Daan Hoogland wrote: > two pulled, > > please note two managerial issues in the one by Saurav: > a trailing space behind the fi in s

Re: [ACS4.4] cherry-pick

2014-05-27 Thread Daan Hoogland
thank Jayapal, pulled On Tue, May 27, 2014 at 11:03 AM, Jayapal Reddy Uradi wrote: > Hi Daan, > > The two issue fixed in below commit, please cherry-pick it to 4.4 > c535b894840e1a625186f7c62796e80950293221 > > Thanks, > Jayapal > > On 27-May-2014, at 2:12 PM, Daan Hoogland > wrote: > >> two pu

[ACS4.4] Cherry pick 63090434b1cb4e7b87f0e024fbbc644faee863f7

2014-05-29 Thread Rayees Namathponnan
Hi Daan, Can you please cherry-pick 63090434b1cb4e7b87f0e024fbbc644faee863f7 to 4.4, "system template always create with name master instead of current git branch" Regards, Rayees

[ACS4.4] cherry-pick request

2014-06-05 Thread Rajesh Battala
Hi Daan, Cherry pick two commits to 4.4 branch 1. 945e879bf221454cd42f1e7ef0a46e9a4aa6a156 CLOUDSTACK-6831 [Hyper-V] Improve the logging for VM snapshot failures as it is not supported. Right now it is throwing NPEs 2. 945e879bf221454cd42f1e7ef0a46e9a4aa6a156 CLOUDSTACK-6833 [Hyp

[ACS4.4]Cherry-pick 09a357fb90b48ed6e2725ea60e632a2ad5529f79

2014-06-10 Thread Min Chen
Hi Daan, Would you please cherry-pick the following commit from 4.4-forward to 4.4? Commit: 09a357fb90b48ed6e2725ea60e632a2ad5529f79 CLOUDSTACK-6890:createVPC invoked by admin does not observe start flag. Thanks -min

Re: [ACS4.4] Cherry-pick

2014-06-18 Thread Daan Hoogland
On Wed, Jun 18, 2014 at 12:59 PM, Rajesh Battala wrote: > 21e452ff4f0459422f0612f2ddf7033a963b0a19 there was a little conflict, which was easily resolved but please double check! -- Daan

Re: [ACS4.4] Cherry-pick

2014-06-18 Thread Daan Hoogland
[ERROR] COMPILATION ERROR : [INFO] -- --- [ERROR] :[174,7] error: LoadBalancingRulesManagerImpl is not abstra

RE: [ACS4.4] Cherry-pick

2014-06-18 Thread Rajesh Battala
Am working on it. -Original Message- From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] Sent: Wednesday, June 18, 2014 5:01 PM To: dev Subject: Re: [ACS4.4] Cherry-pick [ERROR] COMPILATION ERROR : [INFO] -- --- [ERROR] <h

RE: [ACS4.4] Cherry-pick

2014-06-18 Thread Rajesh Battala
, 2014 5:11 PM To: dev@cloudstack.apache.org Subject: RE: [ACS4.4] Cherry-pick Am working on it. -Original Message- From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] Sent: Wednesday, June 18, 2014 5:01 PM To: dev Subject: Re: [ACS4.4] Cherry-pick [ERROR] COMPILATION ERROR : [INFO

Re: [ACS4.4] Cherry-pick

2014-06-18 Thread Daan Hoogland
On Wed, Jun 18, 2014 at 2:07 PM, Rajesh Battala wrote: > b0d726a872e2859a56ee677c15079cc3a59ab894 This again gave me a simple conflict in the interface. another method was added. It was indeed not there so I committed and pushed it. -- Daan

[ACS4.4] cherry pick commit 608500c107f5bbffdb453c00f0f5038243295197

2014-04-24 Thread Sanjay Tripathi
Hi Daan, Could you please cherry-pick following commit to 4.4 branch. Commit: 608500c107f5bbffdb453c00f0f5038243295197 CLOUDSTACK-6494: Typing a pipe '|' character in VM console returns a question mark and pipe '?|'. --Sanjay

[ACS4.4] cherry pick commit ca6e6e2b7cccbec7d065465d547ef7149383f7ae

2014-04-24 Thread Rajesh Battala
Hi Daan, Please cherry-pick the commit to 4.4 branch ca6e6e2b7cccbec7d065465d547ef7149383f7ae this will fix the issue while adding netscaler to 4.4 CLOUDSTACK-6338 [Automation] Failed to NetScaler Device with error https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=commit;h=ca6e6e2b7c

Re: [ACS4.4] Cherry pick 54c0df56dc03d20ef1d9804d8695c3f6584470f8

2014-04-25 Thread Daan Hoogland
On Thu, Apr 24, 2014 at 2:42 AM, Mike Tutkowski wrote: > 54c0df56dc03d20ef1d9804d8695c3f6584470f8 is in -- Daan

Re: [ACS4.4] Cherry pick 6dfa742eb8d6b775317829636bfa28f0ec297242

2014-04-25 Thread Daan Hoogland
On Fri, Apr 25, 2014 at 8:34 PM, Mike Tutkowski wrote: > 6dfa742eb8d6b775317829636bfa28f0ec297242 Mike, how is -totalAllocatedSize = getUsedBytes(pool); +return getUsedBytes(pool); logic added? I did not see any harm in pulling it in. btw. -- Daan

Re: [ACS4.4] Cherry pick 6dfa742eb8d6b775317829636bfa28f0ec297242

2014-04-25 Thread Mike Tutkowski
Perhaps I did not phrase that correctly. It is a slight change in logic to enable managed storage to circumvent the rest of the logic in that method where snapshots and templates get included in the allocated amount (not necessary for managed storage). On Fri, Apr 25, 2014 at 2:28 PM, Daan Hoogl

Re: [ACS4.4] Cherry pick 6dfa742eb8d6b775317829636bfa28f0ec297242

2014-04-25 Thread Daan Hoogland
ah, that makes a lot of sense On Fri, Apr 25, 2014 at 10:41 PM, Mike Tutkowski wrote: > Perhaps I did not phrase that correctly. > > It is a slight change in logic to enable managed storage to circumvent the > rest of the logic in that method where snapshots and templates get included > in the al

[ACS4.4] cherry pick commit 0f755ee4fcb0c2108e87eccea640f50748071050

2014-04-26 Thread Sanjay Tripathi
Hi Hugo/Daan, Could you please cherry-pick following commit to 4.4 branch. Commit: 0f755ee4fcb0c2108e87eccea640f50748071050 CLOUDSTACK-6452: Failed to Live Migrate VM across clusters with Xenserver 6.2.5'. --Sanjay

Re: [ACS4.4] Cherry pick 7694bee83f53a16537032bed3902ef8b4f95c4ab

2014-04-26 Thread Daan Hoogland
On Sat, Apr 26, 2014 at 8:17 AM, Amogh Vasekar wrote: > 7694bee83f53a16537032bed3902ef8b4f95c4ab -- Daan

[ACS4.4] cherry pick commit 6f7f9996f2367b33f56a45b7b11d9720b94fcd55

2014-04-27 Thread Sanjay Tripathi
Hi Hugo/Daan, Could you please cherry-pick following commit to 4.4 branch. Commit: 6f7f9996f2367b33f56a45b7b11d9720b94fcd55 CLOUDSTACK-6480: Creating Service Offering with Implict Dedication planner fails with message: "Please specify the pciDevice and vgpuType correctly". --Sanjay

Re: [ACS4.4] Cherry pick 934056097a638c1563f067b4236ad4c37211e9db

2014-04-28 Thread Mike Tutkowski
Oh, as an FYI, this added/changed logic is to support the downloading of a template from secondary to primary storage for managed storage on XenServer 6.2 with XS62ESP1 and XS62ESP1004 (which uses Xenserver625StorageProcessor). On Tue, Apr 29, 2014 at 12:00 AM, Mike Tutkowski < mike.tutkow...@sol

Re: [ACS4.4] Cherry pick 934056097a638c1563f067b4236ad4c37211e9db

2014-04-29 Thread Daan Hoogland
is in On Tue, Apr 29, 2014 at 8:03 AM, Mike Tutkowski wrote: > Oh, as an FYI, this added/changed logic is to support the downloading of a > template from secondary to primary storage for managed storage on XenServer > 6.2 with XS62ESP1 and XS62ESP1004 (which uses Xenserver625StorageProcessor). >

Re: [ACS4.4] cherry-pick 08ec6ebddaf5a5cddab2be8dfcebf75b91dafa92

2014-04-29 Thread Daan Hoogland
On Tue, Apr 29, 2014 at 11:29 AM, Rajani Karuturi wrote: > 08ec6ebddaf5a5cddab2be8dfcebf75b91dafa92 done -- Daan

[ACS4.4] Cherry-pick CLOUDSTACK-6600

2014-05-11 Thread Min Chen
Hi Daan, Could you please cherry-pick the following commit from 4.4-forward to 4.4 branch? Commit: 500c99eef7f7a04d95ed95697a2678fef283e61d CLOUDSTACK-6600:IAM Security checker needs to have cache to improve checkAccess performance. Thanks -min

[ACS4.4] cherry pick commit e7e1ae254af8588a90bee56f5dcd1175c64ffd5e

2014-05-14 Thread Sanjay Tripathi
Hi Hugo/Daan, Could you please cherry-pick following commit to 4.4 branch. Commit: e7e1ae254af8588a90bee56f5dcd1175c64ffd5e CLOUDSTACK-6649: CS is not giving the system-wide capacity for GPU reosurce. --Sanjay

Re: [ACS4.4] cherry pick commit

2014-05-15 Thread Daan Hoogland
On Thu, May 15, 2014 at 12:26 AM, Nitin Mehta wrote: > 076bbdcfe86d6886ab1ecfc513b02a323a995307 is in -- Daan

[ACS4.4] Cherry-pick 3 bugs

2014-05-16 Thread Min Chen
Hi Daan, Would you please cherry-pick the following 3 bug fixes from 4.4-forward to 4.4 branch? Commit: 500c99eef7f7a04d95ed95697a2678fef283e61d CLOUDSTACK-6600:IAM Security checker needs to have cache to improve checkAccess performance. Commit: b9bdaf9d31803cd080475e27da56695c3293c4ca CLOUDSTA

[ACS4.4] cherry pick commit 4e44ac56c92221c5b9509dca18e14befd7e297fe

2014-05-16 Thread Sanjay Tripathi
Hi Hugo/Daan, Could you please cherry-pick following commit to 4.4 branch. Commit: 4e44ac56c92221c5b9509dca18e14befd7e297fe CLOUDSTACK=6678: API:MS: listCapacity returns; errorcode":530,"cserrorcode":,"errortext":"Index: 0, Size: 0"}. --Sanjay

Re: [ACS4.4] Cherry-pick d5425e1a4a8ed4cadc2f9b97f82f6f608e9a51de

2014-05-19 Thread Daan Hoogland
Nitin, This seems like an enhancement to me. Is there anything broken that is fixed by this enhancement? Please spend some lines to justify why it should be in 4.4? thanks, Daan On Mon, May 19, 2014 at 8:50 AM, Nitin Mehta wrote: > Hi Daan, > Can you please cherry-pick the following commit > d5

Re: [ACS4.4] Cherry-pick d5425e1a4a8ed4cadc2f9b97f82f6f608e9a51de

2014-05-19 Thread Nitin Mehta
Sure Daan. The current listResouceDetails api lists the metadata for all the first class entities and currently doesn't have the flexibility to list it by key,value pair which I think is a basic must have. That¹s why I propose it to be included in 4.4. Thanks, -Nitin On 19/05/14 2:10 AM, "Daan Ho

Re: [ACS4.4] Cherry-pick d5425e1a4a8ed4cadc2f9b97f82f6f608e9a51de

2014-05-19 Thread Daan Hoogland
even so Nitin, it is a new feature with no unit or integration tests. I feel I would be neglecting my task as release manager if I let this in. sorry, Daan On Mon, May 19, 2014 at 7:46 PM, Nitin Mehta wrote: > Sure Daan. The current listResouceDetails api lists the metadata for all > the first c

Re: [ACS4.4] Cherry-pick d5425e1a4a8ed4cadc2f9b97f82f6f608e9a51de

2014-05-19 Thread Nitin Mehta
Sure I understand. Its fine by me. But, its not a new feature. Its adding a param to the api so a minor enhancement. Thanks, -Nitin On 19/05/14 1:47 PM, "Daan Hoogland" wrote: >even so Nitin, it is a new feature with no unit or integration tests. >I feel I would be neglecting my task as release

Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043

2014-05-20 Thread Daan Hoogland
Min, On Tue, May 20, 2014 at 1:30 AM, Min Chen wrote: > Hi Daan, > > As we proposed earlier in community, since IAM feature is not ready for 4.4 > release due to backwards compatibility issue, we need to disable IAM on 4.4. > I have checked in commit f748a552e9546e91e18c574b375f3ea6c8d7e043 on >

Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043

2014-05-20 Thread Min Chen
Hi Daan, What is the conflict? Do you need me to resolve the conflict? Sorry, just realized that the URL is internal to citrix, not visible to outside. Thanks -min On 5/20/14 1:16 AM, "Daan Hoogland" wrote: >Min, > >On Tue, May 20, 2014 at 1:30 AM, Min Chen wrote: >>

Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043

2014-05-20 Thread Daan Hoogland
Sorry Min, I didn't check the conflict, just aborted. On Tue, May 20, 2014 at 6:20 PM, Min Chen wrote: > Hi Daan, > > What is the conflict? Do you need me to resolve the conflict? Sorry, > just > realized that the URL is internal to citrix, not visible to outside. > > Thanks >

Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043

2014-05-20 Thread Min Chen
Ok. Let me try. Can I cherry pick this into 4.4 after resolving the conflict? Thanks -min On 5/20/14 1:44 PM, "Daan Hoogland" wrote: >Sorry Min, > >I didn't check the conflict, just aborted. > >On Tue, May 20, 2014 at 6:20 PM, Min Chen wrote: >> Hi Daan, >> >> What is the conflict? Do

Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043

2014-05-20 Thread Min Chen
Hi Daan, The cherry pick error is due to a deleted iam test since we disabled IAM feature: # Unmerged paths: # (use "git add/rm ..." as appropriate to mark resolution) # # deleted by them:test/integration/smoke/test_vm_iam.py So the fix is to run "git rm test/integr

Re: [ACS4.4] Cherry-pick f748a552e9546e91e18c574b375f3ea6c8d7e043

2014-05-21 Thread Daan Hoogland
On Tue, May 20, 2014 at 11:29 PM, Min Chen wrote: > git rm test/integration/smoke/test_vm_iam.py works. pulled. -- Daan

[ACS4.4] Cherry-pick request : b4457d92f4ceec83f09b4514a0164c7ec3775e4d

2014-05-21 Thread Yoshikazu Nojima
Daan, Could you cherry-pick the commit b4457d92f4ceec83f09b4514a0164c7ec3775e4d ? It fix the bug that makes systemvm template build failed since newer vboxmanage generates $appliance-$branch-vmware-disk3.vmdk. Regards, Noji

Re: [ACS4.4] Cherry-pick e3bb8b98bd9055115004da2ec67b29271a3974c5

2014-05-22 Thread Daan Hoogland
On Thu, May 22, 2014 at 1:29 AM, Kelven Yang wrote: > e3bb8b98bd9055115004da2ec67b29271a3974c5 pulled, please note that there is trailing spaces in xml files and log4j.properties. Reviewing I also encountered an old conflict in comment. I'll look for that one in head and resolve it there. -- D

Re: [ACS4.4] Cherry-pick 356f6121a78d147d72136044c90472234f667730

2014-05-22 Thread Daan Hoogland
On Thu, May 22, 2014 at 3:09 AM, Min Chen wrote: > 356f6121a78d147d72136044c90472234f667730 is in -- Daan

Re: [ACS4.4] Cherry pick request

2014-05-22 Thread Daan Hoogland
On Thu, May 22, 2014 at 7:42 PM, Amogh Vasekar wrote: > 7bbad0491f7ec087f693814caadbe6d648d2edf2 is in -- Daan

[ACS4.4] Cherry pick request : 12e552b06dfac5f19737f79aa0a8424b01b3197e

2014-05-22 Thread Yoshikazu Nojima
Hi Daan, Could you cherry-pick the commit 12e552b06dfac5f19737f79aa0a8424b01b3197e to 4.4? This commit fix the bug that make systemvm build stall. Regards, Noji

Re: [ACS4.4] Cherry-pick 0d243ec7f2e1a0e3508d385f7b793b103c56ca07

2014-05-23 Thread Daan Hoogland
On Thu, May 22, 2014 at 11:31 PM, Min Chen wrote: > 0d243ec7f2e1a0e3508d385f7b793b103c56ca07 done -- Daan

Re: [ACS4.4] Cherry-pick da5ad74d5f4388c4aa1df2f2e5f9053bfb70d83d

2014-05-23 Thread Daan Hoogland
On Fri, May 23, 2014 at 2:00 AM, Min Chen wrote: > da5ad74d5f4388c4aa1df2f2e5f9053bfb70d83d done -- Daan

Re: [ACS4.4] Cherry pick d5fbcafc2ff04e665c2ec8079c759fe4cabf9d1a

2014-05-24 Thread Daan Hoogland
On Sat, May 24, 2014 at 2:10 AM, Min Chen wrote: > d5fbcafc2ff04e665c2ec8079c759fe4cabf9d1a done -- Daan

[ACS4.4] cherry-pick commit 2ab7bcade2f37cb17e071a6154fdae1d80e4ff99

2014-05-26 Thread Rajani Karuturi
Hi Daan, Can you cherry-pick commit 2ab7bcade2f37cb17e071a6154fdae1d80e4ff99 from 4.4-forward to 4.4? This fixes bug CLOUDSTACK-6756 ~Rajani

[ACS4.4] cherry-pick commit c91780449ae13d40ba9a2acfc5e0e6176f1beaee

2014-05-27 Thread Rajani Karuturi
Hi Daan, Can you cherry-pick commit c91780449ae13d40ba9a2acfc5e0e6176f1beaee from 4.4-forward to 4.4? This fixes bug CLOUDSTACK-6781 ~Rajani

Re: [ACS4.4] cherry-pick request

2014-06-05 Thread Daan Hoogland
one commit puled, looks like you are requesting the same pull twice. On Thu, Jun 5, 2014 at 11:50 AM, Rajesh Battala wrote: > Hi Daan, > > Cherry pick two commits to 4.4 branch > > > 1. 945e879bf221454cd42f1e7ef0a46e9a4aa6a156 CLOUDSTACK-6831 [Hyper-V] > Improve the logging for VM snapshot

RE: [ACS4.4] cherry-pick request

2014-06-05 Thread Rajesh Battala
[mailto:daan.hoogl...@gmail.com] Sent: Thursday, June 5, 2014 3:52 PM To: dev Subject: Re: [ACS4.4] cherry-pick request one commit puled, looks like you are requesting the same pull twice. On Thu, Jun 5, 2014 at 11:50 AM, Rajesh Battala wrote: > Hi Daan, > > Cherry pick two commits to 4

Re: [ACS4.4] cherry-pick request

2014-06-05 Thread Daan Hoogland
On Thu, Jun 5, 2014 at 12:25 PM, Rajesh Battala wrote: > d59cc1ff8fa909d37609410e19142b158cecb2f3 in -- Daan

RE: [ACS4.4] cherry-pick request

2014-06-05 Thread Rajesh Battala
Thanks -Original Message- From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] Sent: Thursday, June 5, 2014 6:07 PM To: dev Subject: Re: [ACS4.4] cherry-pick request On Thu, Jun 5, 2014 at 12:25 PM, Rajesh Battala wrote: > d59cc1ff8fa909d37609410e19142b158cecb2f3 in -- Daan

[ACS4.4]Cherry-pick CLOUDSTACK-6859

2014-06-07 Thread Min Chen
Hi Daan, Would you please cherry-pick the following commit from 4.4-forward to 4.4? Commit: 961cd7657e7dbb69d497123071db3156bd15d8e9 CLOUDSTACK-6859:Management Server PermGen run out of memory after some time due to class leak. Thanks -min

Re: [ACS4.4]Cherry-pick 09a357fb90b48ed6e2725ea60e632a2ad5529f79

2014-06-11 Thread Daan Hoogland
On Wed, Jun 11, 2014 at 3:00 AM, Min Chen wrote: > 09a357fb90b48ed6e2725ea60e632a2ad5529f79 is in -- Daan

[ACS4.4] Cherry pick CLOUDSTACK-6971

2014-06-23 Thread Min Chen
Hi Daan, Would you please cherry pick the following commit from 4.4-forward to 4.4 branch? Commit: 31e250a9d2adbf9ee59da66073497e38c02ded86 CLOUDSTACK-6971: createAutoScaleVmProfile failed with NPE due to lack of bean Injection. Thanks -min

[ACS4.4] Cherry pick CLOUDSTACK-6938

2014-06-23 Thread Logan Barfield
Daan, Could you please cherry pick this commit from master to 4.4? Commit: 736bf540e8ef759a101d221622c64f3b3c3ed425 CLOUDSTACK-6938: Cannot create template from snapshot when using S3 storage Thank You, Logan Barfield Tranquil Hosting

Re: [ACS4.4] cherry pick commit 608500c107f5bbffdb453c00f0f5038243295197

2014-04-25 Thread Daan Hoogland
On Thu, Apr 24, 2014 at 10:56 AM, Sanjay Tripathi wrote: > 608500c107f5bbffdb453c00f0f5038243295197 picked -- Daan

Re: [ACS4.4] cherry pick commit ca6e6e2b7cccbec7d065465d547ef7149383f7ae

2014-04-25 Thread Daan Hoogland
On Thu, Apr 24, 2014 at 1:43 PM, Rajesh Battala wrote: > ca6e6e2b7cccbec7d065465d547ef7149383f7ae in -- Daan

RE: [ACS4.4] cherry pick commit ca6e6e2b7cccbec7d065465d547ef7149383f7ae

2014-04-25 Thread Rajesh Battala
Thanks Daan -Original Message- From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] Sent: Saturday, April 26, 2014 1:57 AM To: dev Subject: Re: [ACS4.4] cherry pick commit ca6e6e2b7cccbec7d065465d547ef7149383f7ae On Thu, Apr 24, 2014 at 1:43 PM, Rajesh Battala wrote

Re: [ACS4.4] cherry pick commit 0f755ee4fcb0c2108e87eccea640f50748071050

2014-04-26 Thread Daan Hoogland
On Sat, Apr 26, 2014 at 9:31 AM, Sanjay Tripathi wrote: > 0f755ee4fcb0c2108e87eccea640f50748071050 -- Daan

Re: [ACS4.4] cherry pick commit 6f7f9996f2367b33f56a45b7b11d9720b94fcd55

2014-04-28 Thread Daan Hoogland
On Mon, Apr 28, 2014 at 7:58 AM, Sanjay Tripathi wrote: > 6f7f9996f2367b33f56a45b7b11d9720b94fcd55 -- Daan

[ACS4.4] Cherry-pick for CLOUDSTACK-6317

2014-05-02 Thread Sateesh Chodapuneedi
Hi Dan, Can you please cherry pick following commit into 4.4? Commit: ce7a689ae16f5a28b3ad9ff50a7bb19af31df4cf Branch: refs/heads/4.4-forward Bug: CLOUDSTACK-6317 [VMware] Tagged VLAN support broken for Management/Control/Storage traffic Regards, Sateesh

[ACS4.4] cherry-pick for CLOUDSTACK-6564

2014-05-02 Thread Murali Reddy
Please cherry-pick 4.4-forward commit d5374ed650aaa36d68ee16ca5e69c97e197f1b6e in to 4.4 commit d5374ed650aaa36d68ee16ca5e69c97e197f1b6e Author: Murali Reddy Date: Fri May 2 18:51:28 2014 +0530 CLOUDSTACK-6564: OVS distributed routing: use file based OF rule updates use ovs-ofctl

[ACS4.4] Cherry pick for CLOUDSTACK-6483

2014-05-02 Thread Brian Federle
Please cherry-pick 4.4-forward commits for CLOUDSTACK-6483 (in this order): 0b03609c45ecb5b4525e6a7b5216c70032d94a39 7daabf6515509dc276b968c6ca042cf964a328da 430d14b67608039159403036dae3dc7af1e590f5 Thank you, Brian

[ACS4.4] cherry-pick for CLOUDSTACK-6475

2014-05-02 Thread Alena Prokharchyk
Daan, can you please cherry-pick following commit from 4.4-forward branch? commit 4e7498bc08a11d7b7ca35c2ed3babb85299d74b4 Author: Alena Prokharchyk Date: Fri May 2 13:47:13 2014 -0700 LOUDSTACK-6475: cleanupVPC task - removed the transaction wrapping up multiple VPC destroy as the destro

[ACS4.4] cherry-pick for CLOUDSTACK-6569

2014-05-02 Thread Min Chen
Hi Hugo/Daan, Can you please cherry-pick the following commit from 4.4-forward to 4.4? Commit: 03f6188c1c478222914904e3d7abac2740e98655 CLOUDSTACK-6569: IAM - Regular user is able to listNetworks of another user in the same domain , by passing account and domainId.

[ACS4.4] cherry-pick for CLOUDSTACK-6568

2014-05-02 Thread Min Chen
Hi Hugo/Daan, Can you please cherry-pick the following commit from 4.4-forward to 4.4? Commit: ffec3d02844fe644d40f35c55a83719b8d6102b6 CLOUDSTACK-6568:API:createVolume: Volume gets created with wrong domain ID. Thanks -min

[ACS4.4] Cherry pick for CLOUDSTACK-6571

2014-05-04 Thread Yoshikazu Nojima
Hi Daan or Hugo, Could you cherry pick 03156ecd6f52bfa0c73f1408ac4baca5332d1cad to 4.4? It contains fix for the bug that prevents cloudstack-agent stop. Thanks, Noji

[ACS4.4] Cherry pick for CLOUDSTACK-6483

2014-05-05 Thread Jessica Wang
le UI issues while assigning the VM to LB rule. Thank you. Jessica From: Brian Federle Sent: Friday, May 02, 2014 10:38 AM To: dev@cloudstack.apache.org Cc: Jessica Wang Subject: [ACS4.4] Cherry pick for CLOUDSTACK-6483 Please cherry-pick 4.4-forward commits for CLOUDSTACK-6483 (in this

[ACS4.4] Cherry pick for CLOUDSTACK-6614

2014-05-15 Thread Yoshikazu Nojima
Daan, Could you cherry-pick the commit "3187411f9f6d61d50aa73614f991c4866f5f0375" to 4.4 branch? It resolve the issue that systemvm template build fails. Thanks, Noji

Re: [ACS4.4] cherry pick commit e7e1ae254af8588a90bee56f5dcd1175c64ffd5e

2014-05-15 Thread Daan Hoogland
On Wed, May 14, 2014 at 11:38 AM, Sanjay Tripathi wrote: > e7e1ae254af8588a90bee56f5dcd1175c64ffd5e ok -- Daan

Re: [ACS4.4] cherry pick commit 4e44ac56c92221c5b9509dca18e14befd7e297fe

2014-05-16 Thread Daan Hoogland
On Thu, May 15, 2014 at 10:56 AM, Sanjay Tripathi wrote: > 4e44ac56c92221c5b9509dca18e14befd7e297fe done -- Daan

Re: [ACS4.4] Cherry-pick CLOUDSTACK-6600

2014-05-16 Thread Min Chen
Daan, this commit is already pulled into 4.4 by you. I didn't see trailing white space on my eclipse? Which file are you talking about? Thanks -min On 5/16/14 12:54 AM, "Daan Hoogland" wrote: >On Thu, May 8, 2014 at 2:19 AM, Min Chen wrote: >> 500c99eef7f7a04d95ed95697a2678fef283e61d > > >Not

  1   2   >