[GitHub] cloudstack pull request: [4.5.3]Cherry-pick PR #795 into 4.5 branc...

2015-09-17 Thread asfgit
Github user asfgit closed the pull request at: https://github.com/apache/cloudstack/pull/817 --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is

[GitHub] cloudstack pull request: [4.5.3]Cherry-pick PR #795 into 4.5 branc...

2015-09-17 Thread bhaisaab
Github user bhaisaab commented on the pull request: https://github.com/apache/cloudstack/pull/817#issuecomment-141342804 LGTM, merging this this is already merged on master and builds are passing on 4.5 branch now --- If your project is set up for it, you can reply to this email and

[GitHub] cloudstack pull request: Cherry-pick PR #795 into 4.5 branch.

2015-09-16 Thread borisroman
Github user borisroman commented on the pull request: https://github.com/apache/cloudstack/pull/817#issuecomment-140777872 @bhaisaab Updated the PR. Tests run fine now. Thanks for your time! --- If your project is set up for it, you can reply to this email and have your reply appear o

[GitHub] cloudstack pull request: Cherry-pick PR #795 into 4.5 branch.

2015-09-16 Thread bhaisaab
Github user bhaisaab commented on the pull request: https://github.com/apache/cloudstack/pull/817#issuecomment-140650340 Also there seems to be a license header issue (missing new line between header and package definition in the utils class). --- If your project is set up for it, yo

[GitHub] cloudstack pull request: Cherry-pick PR #795 into 4.5 branch.

2015-09-16 Thread bhaisaab
Github user bhaisaab commented on the pull request: https://github.com/apache/cloudstack/pull/817#issuecomment-140648696 @borisroman not sure about the apache repo error, I'm having build failures when building locally due to getPreferredCharset method not avialable in StringUtils cla

[GitHub] cloudstack pull request: Cherry-pick PR #795 into 4.5 branch.

2015-09-15 Thread borisroman
Github user borisroman commented on the pull request: https://github.com/apache/cloudstack/pull/817#issuecomment-140301614 @bhaisaab Done. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this

[GitHub] cloudstack pull request: Cherry-pick PR #795 into 4.5 branch.

2015-09-14 Thread bhaisaab
Github user bhaisaab commented on the pull request: https://github.com/apache/cloudstack/pull/817#issuecomment-140277680 4.5 was missing upgrade path, implemented that; please push again to force a travis build --- If your project is set up for it, you can reply to this email and hav

[GitHub] cloudstack pull request: Cherry-pick PR #795 into 4.5 branch.

2015-09-14 Thread borisroman
GitHub user borisroman opened a pull request: https://github.com/apache/cloudstack/pull/817 Cherry-pick PR #795 into 4.5 branch. You can merge this pull request into a Git repository by running: $ git pull https://github.com/borisroman/cloudstack 4.5 Alternatively you can

Re: [4.5][CLOUDSTACK-8649] Cherry pick fix SSH key registering

2015-07-24 Thread Rohit Yadav
On 24-Jul-2015, at 1:42 pm, Wido den Hollander mailto:w...@widodh.nl>> wrote: Hi Rohit, Could you cherry-pick 2e79c628e052ebdaf782458cfe4c4ef6e95545c6 into the 4.5 branch? This is the issue: https://issues.apache.org/jira/browse/CLOUDSTACK-8649 Wido Done. Regards, Rohit Yadav So

[4.5][CLOUDSTACK-8649] Cherry pick fix SSH key registering

2015-07-24 Thread Wido den Hollander
Hi Rohit, Could you cherry-pick 2e79c628e052ebdaf782458cfe4c4ef6e95545c6 into the 4.5 branch? This is the issue: https://issues.apache.org/jira/browse/CLOUDSTACK-8649 Wido

Re: [ACS4.4.1] Cherry-pick for CLOUDSTACK-7087

2014-08-31 Thread Francois Gaudreault
Thx! On Aug 31, 2014 1:59 PM, "Daan Hoogland" wrote: > > On Sat, Aug 30, 2014 at 10:14 PM, Francois Gaudreault < > fgaudrea...@cloudops.com> wrote: > >> 2dfd278625a5d569a5cce2fec5ccb0d7c515c9e8 >> > > ​picked to 4.4​ > > > > -- > Daan >

Re: [ACS4.4.1] Cherry-pick for CLOUDSTACK-7087

2014-08-31 Thread Daan Hoogland
On Sat, Aug 30, 2014 at 10:14 PM, Francois Gaudreault < fgaudrea...@cloudops.com> wrote: > 2dfd278625a5d569a5cce2fec5ccb0d7c515c9e8 > ​picked to 4.4​ -- Daan

Re: [ACS4.4.1] Cherry-Pick fix for CLOUDSTACK-7124

2014-08-31 Thread Francois Gaudreault
eir fix >>> in 4.4.1. >>> >>> FG >>> >>> >>> On 2014-08-30, 5:25 AM, Daan Hoogland wrote: >>> >>> What commit is it, Francois? >>> >>> >>> On Fri

Re: [ACS4.4.1] Cherry-Pick fix for CLOUDSTACK-7124

2014-08-31 Thread Daan Hoogland
g 29, 2014 at 6:47 PM, Francois Gaudreault >> mailto:fgaudrea...@cloudops.com> >> <mailto:fgaudrea...@cloudops.com >> >> <mailto:fgaudrea...@cloudops.com>>> wrote: >> >> Hi, >> >> Any

[ACS4.4.1] Cherry-pick for CLOUDSTACK-7087

2014-08-30 Thread Francois Gaudreault
This is another issue that should be fixed in 4.4.1. I think it's in 4.3.1, and master, but not 4.4.1. I am running master systemvms in my setup to avoid that issue, but I am not sure it's a good idea :P Master commit is 2dfd278625a5d569a5cce2fec5ccb0d7c515c9e8 https://issues.apache.org/jira/b

Re: [ACS4.4.1] Cherry-Pick fix for CLOUDSTACK-7124

2014-08-30 Thread Francois Gaudreault
hat commit is it, Francois? On Fri, Aug 29, 2014 at 6:47 PM, Francois Gaudreault mailto:fgaudrea...@cloudops.com> <mailto:fgaudrea...@cloudops.com <mailto:fgaudrea...@cloudops.com>>> wrote: Hi, Any chance we cou

Re: [ACS4.4.1] Cherry-Pick fix for CLOUDSTACK-7124

2014-08-30 Thread Daan Hoogland
:47 PM, Francois Gaudreault < >> fgaudrea...@cloudops.com <mailto:fgaudrea...@cloudops.com>> wrote: >> >> Hi, >> >> Any chance we could cherry-pick the commit from master to fix >> CLOUDSTACK-7124 on 4.4.1? We are also impacted. >>

Re: [ACS4.4.1] Cherry-Pick fix for CLOUDSTACK-7124

2014-08-30 Thread Francois Gaudreault
14-08-30, 5:25 AM, Daan Hoogland wrote: What commit is it, Francois? On Fri, Aug 29, 2014 at 6:47 PM, Francois Gaudreault mailto:fgaudrea...@cloudops.com>> wrote: Hi, Any chance we could cherry-pick the commit from master to fix CLOUDSTACK-7124 on 4.4.1? We are al

Re: [ACS4.4.1] Cherry-Pick fix for CLOUDSTACK-7124

2014-08-30 Thread Daan Hoogland
What commit is it, Francois? On Fri, Aug 29, 2014 at 6:47 PM, Francois Gaudreault < fgaudrea...@cloudops.com> wrote: > Hi, > > Any chance we could cherry-pick the commit from master to fix > CLOUDSTACK-7124 on 4.4.1? We are also impacted. > > Thanks! > > -- > F

[ACS4.4.1] Cherry-Pick fix for CLOUDSTACK-7124

2014-08-29 Thread Francois Gaudreault
Hi, Any chance we could cherry-pick the commit from master to fix CLOUDSTACK-7124 on 4.4.1? We are also impacted. Thanks! -- Francois Gaudreault Gestionnaire de Produit | Product Manager - Cloud Platform & Services t:514-629-6775 CloudOps Votre partenaire infonuagique | Cloud Solut

Re: [ACS 4.4] Cherry pick request

2014-07-17 Thread Daan Hoogland
ep causing conflicts. I made the mistake of adding >> the conflicting lines this time. this 4.4-forward branch is not >> suitable for providing cherry-picks for an RM because of this. I thin >> people should just branch 4.4 for their changes and let me cherry-pick >> from the

Re: [ACS 4.4] Cherry pick request

2014-07-17 Thread Mike Tutkowski
; people should just branch 4.4 for their changes and let me cherry-pick > from there. Also the automation tests running on 4.4-forward instead > of 4.4 is not very useful. > > > > On Fri, Jul 18, 2014 at 6:00 AM, Mike Tutkowski > wrote: > > Perhaps there is some conf

Re: [ACS 4.4] Cherry pick request

2014-07-17 Thread Daan Hoogland
just branch 4.4 for their changes and let me cherry-pick from there. Also the automation tests running on 4.4-forward instead of 4.4 is not very useful. On Fri, Jul 18, 2014 at 6:00 AM, Mike Tutkowski wrote: > Perhaps there is some confusion again as to the nature of the 4.4-forward > branch.

Re: [ACS 4.4] Cherry pick request

2014-07-17 Thread Mike Tutkowski
Perhaps there is some confusion again as to the nature of the 4.4-forward branch. A while back, we agreed that changes put in here would not be cherry picked to 4.4 unless requested so by the developer and agreed to by the RM. Changes in 4.4-forward that do not go into 4.4 will at least go into 4

Re: [ACS 4.4] Cherry pick request

2014-07-17 Thread Daan Hoogland
They keep coming in with cherry-picks that include this file. I will remove them. On Fri, Jul 18, 2014 at 12:22 AM, Nitin Mehta wrote: > Hi Daan - I am not sure I get your point here. These changes were put in > as I want them in 4.4.1, but were not critical enough to be put in 4.4. > > Thanks, >

Re: [ACS 4.4] Cherry pick request

2014-07-17 Thread Nitin Mehta
Hi Daan - I am not sure I get your point here. These changes were put in as I want them in 4.4.1, but were not critical enough to be put in 4.4. Thanks, -Nitin On 17/07/14 2:58 PM, "Daan Hoogland" wrote: >sure? I saw that the last few lines where not in the last version. > >I'm not confortable

Re: [ACS 4.4] Cherry pick request

2014-07-17 Thread Daan Hoogland
sure? I saw that the last few lines where not in the last version. I'm not confortable with this bit, it has been coming up a few time before already looks like some commit on 4.4-forward is trying to sneak it's way into the release: @@ -2439,4 +2474,16 @@ CONSTRAINT `fk_lb_healthcheck_policy_

Re: [ACS 4.4] Cherry pick request

2014-07-17 Thread Amogh Vasekar
Seems good, looks like was an issue with a newline somewhere. But deploydb went fine on 4.4 Thanks, Amogh On 7/17/14 2:42 PM, "Daan Hoogland" wrote: >Amogh, I couldn't help myself. please have a look at the resulting >setup/db/db/schema-430to440.sql > >On Thu, Jul 17, 2014 at 11:35 PM, Daan Hoo

Re: [ACS 4.4] Cherry pick request

2014-07-17 Thread Daan Hoogland
Amogh, I couldn't help myself. please have a look at the resulting setup/db/db/schema-430to440.sql On Thu, Jul 17, 2014 at 11:35 PM, Daan Hoogland wrote: > On Thu, Jul 17, 2014 at 11:19 PM, Amogh Vasekar > wrote: >> c8ca15b95a57a3d79b71c76c913e295f6490f05d > > Amogh, it has conflicts. I will hav

Re: [ACS 4.4] Cherry pick request

2014-07-17 Thread Daan Hoogland
On Thu, Jul 17, 2014 at 11:19 PM, Amogh Vasekar wrote: > c8ca15b95a57a3d79b71c76c913e295f6490f05d Amogh, it has conflicts. I will have a look at those in the morning -- Daan

[ACS 4.4] Cherry pick request

2014-07-17 Thread Amogh Vasekar
Hi Daan, Can you please cherry-pick c8ca15b95a57a3d79b71c76c913e295f6490f05d This is for CLOUDSTACK-6358. Thanks, Amogh

Re: [ACS 4.4] cherry-pick CLOUDSTACK-7047

2014-07-03 Thread Daan Hoogland
On Thu, Jul 3, 2014 at 3:27 AM, Prachi Damle wrote: ... > Commit# 40e28de7275804f4483868ba8a737878ff54fba8 You are intrroducing windows line endings! picking anyway. > Commit# f37b1524892ab805615dbff2c59e5a1d10c116d3 regards, -- Daan

[ACS 4.4] cherry-pick CLOUDSTACK-7047

2014-07-02 Thread Prachi Damle
Hi Daan, Please can you cherry-pick the following 2 commits to 4.4 CLOUDSTACK-7047 Commit# 40e28de7275804f4483868ba8a737878ff54fba8 Commit# f37b1524892ab805615dbff2c59e5a1d10c116d3 Thanks, Prachi

Re: [ACS 4.4] cherry-pick

2014-07-01 Thread Daan Hoogland
2 in On Tue, Jul 1, 2014 at 11:56 AM, Jayapal Reddy Uradi wrote: > Hi Daan, > > Please cherry-pick the following commits to 4.4 > > commit e336796cd5eae39bf7755d981426160a15bc6e9f > CLOUDSTACK-7028: Fixed adding route for additional public nic on fa

Re: [ACS4.4] Text change to cherry pick if it's not too late

2014-07-01 Thread Daan Hoogland
On Tue, Jul 1, 2014 at 5:33 AM, Mike Tutkowski wrote: > 76930f6eab01d8659b71e5753111de52eca73b5b in -- Daan

[ACS 4.4] cherry-pick

2014-07-01 Thread Jayapal Reddy Uradi
Hi Daan, Please cherry-pick the following commits to 4.4 commit e336796cd5eae39bf7755d981426160a15bc6e9f CLOUDSTACK-7028: Fixed adding route for additional public nic on fail over commit a69c1ee31d233d4a6f77d68fd70b9cfe3c85f89b CLOUDSTACK-7027: Removing left over static nat rule Thanks

[ACS4.4] Text change to cherry pick if it's not too late

2014-06-30 Thread Mike Tutkowski
Hi Daan, Speaking of low-risk fixes for 4.4, I have one: 76930f6eab01d8659b71e5753111de52eca73b5b I noticed a label of "label.cache.mode" in the Add Disk Offering dialog. I tracked it down to a missing line in dictionary.jsp. If it's not too late, please cherry pick to 4.4. Th

Re: [ACS-4.4] cherry-pick

2014-06-30 Thread Daan Hoogland
On Mon, Jun 30, 2014 at 1:21 PM, Jayapal Reddy Uradi wrote: > 004d616322ba55d83407545f5b10c95ce48f75b5 I missed this one but it is in now. -- Daan

[ACS-4.4] cherry-pick

2014-06-30 Thread Jayapal Reddy Uradi
Hi Daan, Can you please cherry pick the below commit to 4.4 commit 004d616322ba55d83407545f5b10c95ce48f75b5 CLOUDSTACK-6997: Increase proc ip_conntrack_max Thanks, Jayapal

Re: [ACS4.4] Please cherry-pick 9c2e6f5ed45522ff68131556028f3fb4ff91ee90

2014-06-27 Thread Mike Tutkowski
I see it now. Thanks! On Fri, Jun 27, 2014 at 1:17 AM, Daan Hoogland wrote: > No I did: the push. it is there now > > On Fri, Jun 27, 2014 at 8:14 AM, Mike Tutkowski > wrote: > > Hi Daan, > > > > I'm not seeing this commit in 4.4. > > > > Did I miss something? > > > > Thanks! > > Mike > > > >

Re: [ACS4.4] cherry pick commit dc22566c642e400014332045a224e5545d33a11c and 48646ae186eb75052da3da385404a823bd785444

2014-06-27 Thread Daan Hoogland
Hoogland [mailto:daan.hoogl...@gmail.com] > Sent: Friday, June 27, 2014 1:49 PM > To: Sanjay Tripathi > Cc: dev@cloudstack.apache.org > Subject: Re: [ACS4.4] cherry pick commit > dc22566c642e400014332045a224e5545d33a11c and > 48646ae186eb75052da3da385404a823bd785444 > > So, if th

Re: [ACS4,4] cherry pick commit 75aa243d1ea64493b70e9d8466d96c4842dfdf1a

2014-06-27 Thread Daan Hoogland
On Fri, Jun 27, 2014 at 11:12 AM, Sateesh Chodapuneedi wrote: > 75aa243d1ea64493b70e9d8466d96c4842dfdf1a is in -- Daan

RE: [ACS4.4] cherry pick commit dc22566c642e400014332045a224e5545d33a11c and 48646ae186eb75052da3da385404a823bd785444

2014-06-27 Thread Sanjay Tripathi
hi Cc: dev@cloudstack.apache.org Subject: Re: [ACS4.4] cherry pick commit dc22566c642e400014332045a224e5545d33a11c and 48646ae186eb75052da3da385404a823bd785444 So, if the user is not passing the type as second parameter, we don't need to check GPU values? On Fri, Jun 27, 2014 at 10:01 AM,

[ACS4,4] cherry pick commit 75aa243d1ea64493b70e9d8466d96c4842dfdf1a

2014-06-27 Thread Sateesh Chodapuneedi
Hi Daan, Request you to cherry pick following commit to 4.4 branch. Branch: refs/heads/4.4-forward Commit: 75aa243d1ea64493b70e9d8466d96c4842dfdf1a Parents: 48646ae This fixes bug CLOUDSTACK-6996 which is critical bug for CloudStack deployments over VMware which involves upgrade from

Re: [ACS4.4] cherry pick commit dc22566c642e400014332045a224e5545d33a11c and 48646ae186eb75052da3da385404a823bd785444

2014-06-27 Thread Daan Hoogland
al Message- > From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] > Sent: Friday, June 27, 2014 1:15 PM > To: Sanjay Tripathi > Cc: dev@cloudstack.apache.org > Subject: Re: [ACS4.4] cherry pick commit > dc22566c642e400014332045a224e5545d33a11c and > 48646ae186eb75052da3

RE: [ACS4.4] cherry pick commit dc22566c642e400014332045a224e5545d33a11c and 48646ae186eb75052da3da385404a823bd785444

2014-06-27 Thread Sanjay Tripathi
source capacity details. And, thanks for pushing the patch :) . --Sanjay -Original Message- From: Daan Hoogland [mailto:daan.hoogl...@gmail.com] Sent: Friday, June 27, 2014 1:15 PM To: Sanjay Tripathi Cc: dev@cloudstack.apache.org Subject: Re: [ACS4.4] che

Re: [ACS4.4] cherry pick commit dc22566c642e400014332045a224e5545d33a11c and 48646ae186eb75052da3da385404a823bd785444

2014-06-27 Thread Daan Hoogland
27, 2014 at 8:28 AM, Sanjay Tripathi wrote: > Hi Daan, > > Could you please cherry-pick following commits to 4.4 branch. > > Commit: dc22566c642e400014332045a224e5545d33a11c > CLOUDSTACK-6453: [GPU] Windows 2012 Server instance created with vGPU > offering is not coming up aft

Re: [ACS4.4] Please cherry-pick 9c2e6f5ed45522ff68131556028f3fb4ff91ee90

2014-06-27 Thread Daan Hoogland
No I did: the push. it is there now On Fri, Jun 27, 2014 at 8:14 AM, Mike Tutkowski wrote: > Hi Daan, > > I'm not seeing this commit in 4.4. > > Did I miss something? > > Thanks! > Mike > > > On Thu, Jun 26, 2014 at 11:16 AM, Daan Hoogland > wrote: > >> On Thu, Jun 26, 2014 at 6:53 PM, Mike Tutk

[ACS4.4] cherry pick commit dc22566c642e400014332045a224e5545d33a11c and 48646ae186eb75052da3da385404a823bd785444

2014-06-26 Thread Sanjay Tripathi
Hi Daan, Could you please cherry-pick following commits to 4.4 branch. Commit: dc22566c642e400014332045a224e5545d33a11c CLOUDSTACK-6453: [GPU] Windows 2012 Server instance created with vGPU offering is not coming up after installing PV drivers. Commit: 48646ae186eb75052da3da385404a823bd785444

Re: [ACS4.4] Please cherry-pick 9c2e6f5ed45522ff68131556028f3fb4ff91ee90

2014-06-26 Thread Mike Tutkowski
Hi Daan, I'm not seeing this commit in 4.4. Did I miss something? Thanks! Mike On Thu, Jun 26, 2014 at 11:16 AM, Daan Hoogland wrote: > On Thu, Jun 26, 2014 at 6:53 PM, Mike Tutkowski > wrote: > > 9c2e6f5ed45522ff68131556028f3fb4ff91ee90 > > > is in > > -- > Daan > -- *Mike Tutkowski* *

Re: [ACS4.4] Please cherry-pick 9c2e6f5ed45522ff68131556028f3fb4ff91ee90

2014-06-26 Thread Daan Hoogland
On Thu, Jun 26, 2014 at 6:53 PM, Mike Tutkowski wrote: > 9c2e6f5ed45522ff68131556028f3fb4ff91ee90 is in -- Daan

[ACS4.4] Please cherry-pick 9c2e6f5ed45522ff68131556028f3fb4ff91ee90

2014-06-26 Thread Mike Tutkowski
Hi Daan, Please cherry pick 9c2e6f5ed45522ff68131556028f3fb4ff91ee90. This is the i18n issue I referred to yesterday that was in the Add Primary Storage window. Thanks! -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing

Re: [ACS-4.4] cherry-pick

2014-06-24 Thread Daan Hoogland
On Tue, Jun 24, 2014 at 7:38 AM, Jayapal Reddy Uradi wrote: > a195e50ae7da4b4392844e2984823c1331ca1396 is in -- Daan

[ACS-4.4] cherry-pick

2014-06-23 Thread Jayapal Reddy Uradi
Hi Daan, Please cherry pick the following commit to 4.4 a195e50ae7da4b4392844e2984823c1331ca1396 Thanks, Jayapal

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

2014-06-23 Thread Daan Hoogland
On Mon, Jun 23, 2014 at 8:19 PM, Logan Barfield wrote: > 736bf540e8ef759a101d221622c64f3b3c3ed425 is in -- Daan

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

2014-06-23 Thread Daan Hoogland
On Mon, Jun 23, 2014 at 7:08 PM, Min Chen wrote: > 31e250a9d2adbf9ee59da66073497e38c02ded86 is in -- Daan

[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

[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

Re: [ACS44] Cherry pick Request

2014-06-23 Thread Daan Hoogland
une 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 > wrote: >>> commit 64153a43711420224655bfbe248b4b87474a1f23 >> conflicts, will have a look in a m

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 wrote: >>

Re: [ACS44] Cherry pick Request

2014-06-23 Thread Daan Hoogland
On Mon, Jun 23, 2014 at 9:52 AM, Daan Hoogland 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
On Mon, Jun 23, 2014 at 9:43 AM, Anshul Gangwar wrote: ... > commit ef45f06f88c955dcf47f1fb69a3a0e87eb817e1d is in > commit e7ba46b5f7da21c4fc13dc3284aa802d177045f2 is in > commit 64153a43711420224655bfbe248b4b87474a1f23 conflicts, will have a look in a minute

[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 Date: Mon Jun 23 10:58:44 2014 +0530 CLOUDSTACK-6965: fixed the NullPointerException introduced by fix for cloudstack 6935 in

Re: [ACS44] Cherry-pick for CLOUDSTACK-6970

2014-06-20 Thread Daan Hoogland
On Fri, Jun 20, 2014 at 7:49 PM, Kelven Yang wrote: > 06d8d3a03f7a4efc41c45d9f67fd5b7586a78454 is in -- Daan

[ACS44] Cherry-pick for CLOUDSTACK-6970

2014-06-20 Thread Kelven Yang
Daan, Please cherry-pick following from 4.4-forward to 4.4 commit 06d8d3a03f7a4efc41c45d9f67fd5b7586a78454 Author: Kelven Yang Date: Thu May 29 09:35:03 2014 -0700 CLOUDSTACK-6970: Protect event interpretion from causing NPE exception Thanks Kelven

Re: [ACS44] cherry-pick request

2014-06-19 Thread Daan Hoogland
On Thu, Jun 19, 2014 at 2:22 PM, Murali Reddy wrote: > d8cbba1bc616d43e218229a2807915c1b21569dc is in -- 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: [ACS 4.4] cherry-pick request for CLOUDSTACK-6935

2014-06-19 Thread Daan Hoogland
On Wed, Jun 18, 2014 at 10:35 PM, Yoshikazu Nojima wrote: > 45f0c7367680f4bfbcee470139b708d69322be78 is in -- Daan

Re: [ACS 4.4] cherry-pick request for CLOUDSTACK-6935

2014-06-18 Thread Yoshikazu Nojima
Daan, Could you cherry-pick 45f0c7367680f4bfbcee470139b708d69322be78 instead of cd414a0f56798ae801fc464be127e37daabef809? Regards, Noji 2014-06-18 11:59 GMT-06:00 Yoshikazu Nojima : > Daan, > > Could you cherry-pick the commit > "cd414a0f56798ae801fc464be127e37daabef809"

[ACS 4.4] cherry-pick request for CLOUDSTACK-6935

2014-06-18 Thread Yoshikazu Nojima
Daan, Could you cherry-pick the commit "cd414a0f56798ae801fc464be127e37daabef809" into 4.4? This is a fix to the bug CLOUDSTACK-6935. Bug description: Some storage pool filtering logic like hypervisor type check, storage type check for root volume and avoid list check is not

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

RE: [ACS4.4] Cherry-pick

2014-06-18 Thread Rajesh Battala
changes are based on top of it. Please cherry-pick b0d726a872e2859a56ee677c15079cc3a59ab894 and then apply my commit on top of it which will resolve the issue. Thanks Rajesh Battala -Original Message- From: Rajesh Battala [mailto:rajesh.batt...@citrix.com] Sent: Wednesday, June 18

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 Daan Hoogland
[ERROR] COMPILATION ERROR : [INFO] -- --- [ERROR] :[174,7] error: LoadBalancingRulesManagerImpl is not abstra

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

[ACS4.4] Cherry-pick

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

Re: [ACS 4.4] cherry-pick

2014-06-17 Thread Jayapal Reddy Uradi
Hi Daan, The conflicts resolved looks fine. You can ignore my patch. Thanks, Jayapal On 17-Jun-2014, at 5:50 PM, Daan Hoogland wrote: > I don't think I was clear. I don't need a new patch. I did resolve the > conflict. I need you to check if I did the right thing in branch 4.4 > in EventTypes

[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

Re: [ACS44] cherry-pick request

2014-06-17 Thread Daan Hoogland
On Tue, Jun 17, 2014 at 2:26 PM, Murali Reddy wrote: > 8ca8a7217ec155a37b24e3d9cfc3d5fc67adef2d is in -- Daan

Re: [ACS 4.4] cherry-pick

2014-06-17 Thread Daan Hoogland
I don't think I was clear. I don't need a new patch. I did resolve the conflict. I need you to check if I did the right thing in branch 4.4 in EventTypes near line 550 your new patch doesn't apply to 4.4 or 4.4-forward > git am -s > ~/Downloads/0001-CLOUDSTACK-6922-Updated-events-for-firewall-in

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

Re: [ACS44] Cherry Pick Request

2014-06-17 Thread Daan Hoogland
rg/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 > wrote: >> Daan, >> >> Ple

Re: [ACS 4.4] cherry-pick

2014-06-17 Thread Jayapal Reddy Uradi
Hi Daan, Resolved the conflicts and uploaded patch in review board. https://reviews.apache.org/r/22679/ Thanks, Jayapal On 17-Jun-2014, at 4:52 PM, Daan Hoogland wrote: > On Tue, Jun 17, 2014 at 8:41 AM, Jayapal Reddy Uradi > wrote: >> 2214bd2502a34ee8e671eb6b4efe8cd26e29ac5a > > > I had c

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

Re: [ACS 4.4] cherry-pick

2014-06-17 Thread Daan Hoogland
On Tue, Jun 17, 2014 at 8:41 AM, Jayapal Reddy Uradi wrote: > 2214bd2502a34ee8e671eb6b4efe8cd26e29ac5a I had conflicts. Can you have a look near line 550? I resolved by changing IpAddress to PublicIpAddress. regards -- Daan

[ACS 4.4] cherry-pick

2014-06-17 Thread Jayapal Reddy Uradi
Hi Daan, Please cherry pick the following commit into 4.4 commit b0d726a872e2859a56ee677c15079cc3a59ab894 CLOUDSTACK-6923: updated listLBStickinessPolicies API to list using stickiness policy id Thanks, Jayapal

[ACS 4.4] cherry-pick

2014-06-16 Thread Jayapal Reddy Uradi
Hi Daan, Please cherry pick the following commit to 4.4 commit 2214bd2502a34ee8e671eb6b4efe8cd26e29ac5a CLOUDSTACK-6922: Updated events for firewall ingress and egress Thanks, Jayapal

Re: [ACS44] Cherry pick request

2014-06-16 Thread Daan Hoogland
On Mon, Jun 16, 2014 at 11:31 PM, Amogh Vasekar wrote: > de04881da177b28d7cb3efc09adb2d8069f0fdd3 is in -- 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

Re: [ACS44] Cherry Pick Request

2014-06-16 Thread Daan Hoogland
On Mon, Jun 16, 2014 at 4:28 PM, Santhosh Edukulla wrote: > Daan, > > Please pick up the below fixes for resource leaks and other Coverity issues. > > 4ba3aae2ea0290ca012623083e13625e08a9dde5 was in already? > 3c5f64c97ab071451aee7f232d8f2cec6d89044d in > dbfce8b11e25855a8cb21ec2bbbfe20940bb788d

[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 91d054cb00f6a5818f2b

Re: [ACS44] cherry-pick request

2014-06-13 Thread Daan Hoogland
both pulled On Fri, Jun 13, 2014 at 1:53 PM, Murali Reddy 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 e

[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

Re: [ACS44] Cherry pick for CLOUDSTACK-6897, CLOUDSTACK-6868, CLOUDSTACK-6872, CLOUDSTACK-6867, CLOUDSTACK-6865

2014-06-13 Thread Daan Hoogland
4 picked On Fri, Jun 13, 2014 at 12:25 PM, Anshul Gangwar wrote: > Hi Daan/Hugo, > > > > Can you please cherry-pick following commits from 4.4-forward to 4.4: > > > > commit 2dc9e2c530b36efc4c4684e13ae0412103925d05 > > Author: Anshul Gangwar > >

[ACS44] Cherry pick for CLOUDSTACK-6897, CLOUDSTACK-6868, CLOUDSTACK-6872, CLOUDSTACK-6867, CLOUDSTACK-6865

2014-06-13 Thread Anshul Gangwar
Hi Daan/Hugo, Can you please cherry-pick following commits from 4.4-forward to 4.4: commit 2dc9e2c530b36efc4c4684e13ae0412103925d05 Author: Anshul Gangwar Date: Thu Jun 12 13:54:56 2014 +0530 CLOUDSTACK-6897: when we try to attach the uploaded/allocated volume to a VM on zwps, then we

Re: [ACS-4.4] Cherry-pick 8a9092c3cd4e3c034f9f4d0a7491875dc080e9dc

2014-06-12 Thread Nitin Mehta
Looks good Daan. Thanks. On 12/06/14 3:18 AM, "Daan Hoogland" wrote: >On Thu, Jun 12, 2014 at 12:49 AM, Nitin Mehta >wrote: >> 8a9092c3cd4e3c034f9f4d0a7491875dc080e9dc > > >is in after conflict reolution, please check. > >-- >Daan

Re: [ACS 4.4] commit cherry-pick

2014-06-12 Thread Daan Hoogland
On Thu, Jun 12, 2014 at 1:53 PM, Jayapal Reddy Uradi wrote: > e9f60ee292109633ae538694107f3450693716d2 is in -- Daan

[ACS 4.4] commit cherry-pick

2014-06-12 Thread Jayapal Reddy Uradi
Hi Daan, Can you please cherry pick the following commit to 4.4 commit: e9f60ee292109633ae538694107f3450693716d2 CLOUDSTACK-6899: Added vmId in listings response Thanks, Jayapal

Re: [ACS44] Cherry-Pick

2014-06-12 Thread Daan Hoogland
On Thu, Jun 12, 2014 at 1:22 PM, Santhosh Edukulla wrote: > 62cc238e1276bad1af7934fe5c150fe801b89140 is in -- Daan

[ACS44] Cherry-Pick

2014-06-12 Thread Santhosh Edukulla
Hi Daan, Please cherry pick the below commit. Bugid: CLOUDSTACK-6791 Commit id : 62cc238e1276bad1af7934fe5c150fe801b89140 Thanks! Santhosh

  1   2   3   4   5   6   >