Build failed in Jenkins: cloudstack-apidocs-master #1824

2015-02-26 Thread Apache Jenkins Server 
See 

Changes:

[talluri] CLOUDSTACK-8276: Changes in Marvin to find free vlan in a setup when 
vlan is not returned for an existing network with listNetworks API

[talluri] CLOUDSTACK-8277: Code improvement - test_shared_networks.py, 
test_multiple_ip_ranges.py

--
[...truncated 4347 lines...]
[INFO] --- maven-compiler-plugin:3.2:compile (default-compile) @ 
cloud-plugin-network-contrail ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 30 source files to 

[INFO] -
[ERROR] COMPILATION ERROR : 
[INFO] -
[ERROR] error: error reading 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/commons/commons-exec/1.3/commons-exec-1.3.jar;
 error in opening zip file
[INFO] 1 error
[INFO] -
[JENKINS] Archiving disabled
[INFO] 
[INFO] Reactor Summary:
[INFO] 
[INFO] Apache CloudStack Developer Tools - Checkstyle Configuration  SUCCESS 
[3.987s]
[INFO] Apache CloudStack . SUCCESS [1.553s]
[INFO] Apache CloudStack Maven Conventions Parent  SUCCESS [1.408s]
[INFO] Apache CloudStack Framework - Managed Context . SUCCESS [15.159s]
[INFO] Apache CloudStack Utils ... SUCCESS [26.778s]
[INFO] Apache CloudStack Framework ... SUCCESS [0.497s]
[INFO] Apache CloudStack Framework - Event Notification .. SUCCESS [5.751s]
[INFO] Apache CloudStack Framework - Configuration ... SUCCESS [4.158s]
[INFO] Apache CloudStack API . SUCCESS [11.207s]
[INFO] Apache CloudStack Framework - REST  SUCCESS [3.436s]
[INFO] Apache CloudStack Framework - IPC . SUCCESS [3.729s]
[INFO] Apache CloudStack Cloud Engine  SUCCESS [0.416s]
[INFO] Apache CloudStack Cloud Engine API  SUCCESS [4.423s]
[INFO] Apache CloudStack Framework - Security  SUCCESS [2.632s]
[INFO] Apache CloudStack Core  SUCCESS [21.769s]
[INFO] Apache CloudStack Agents .. SUCCESS [5.514s]
[INFO] Apache CloudStack Framework - Clustering .. SUCCESS [2.844s]
[INFO] Apache CloudStack Framework - Event Notification .. SUCCESS [2.322s]
[INFO] Apache CloudStack Cloud Engine Schema Component ... SUCCESS [10.304s]
[INFO] Apache CloudStack Framework - Jobs  SUCCESS [3.860s]
[INFO] Apache CloudStack Cloud Engine Internal Components API  SUCCESS [2.902s]
[INFO] Apache CloudStack Server .. SUCCESS [47.410s]
[INFO] Apache CloudStack Usage Server  SUCCESS [7.075s]
[INFO] Apache CloudStack Cloud Engine Orchestration Component  SUCCESS [7.595s]
[INFO] Apache CloudStack Cloud Services .. SUCCESS [0.384s]
[INFO] Apache CloudStack Secondary Storage ... SUCCESS [1.094s]
[INFO] Apache CloudStack Secondary Storage Service ... SUCCESS [4.849s]
[INFO] Apache CloudStack Engine Storage Component  SUCCESS [6.240s]
[INFO] Apache CloudStack Engine Storage Volume Component . SUCCESS [4.089s]
[INFO] Apache CloudStack Engine Storage Image Component .. SUCCESS [3.286s]
[INFO] Apache CloudStack Engine Storage Data Motion Component  SUCCESS [3.022s]
[INFO] Apache CloudStack Engine Storage Cache Component .. SUCCESS [3.244s]
[INFO] Apache CloudStack Engine Storage Snapshot Component  SUCCESS [8.175s]
[INFO] Apache CloudStack Cloud Engine API  SUCCESS [2.629s]
[INFO] Apache CloudStack Cloud Engine Service  SUCCESS [10.359s]
[INFO] Apache CloudStack Plugin POM .. SUCCESS [0.777s]
[INFO] Apache CloudStack Plugin - API Rate Limit . SUCCESS [7.010s]
[INFO] Apache CloudStack Plugin - Storage Volume default provider  SUCCESS 
[3.210s]
[INFO] Apache CloudStack Plugin - Storage Volume SolidFire Provider  SUCCESS 
[4.743s]
[INFO] Apache CloudStack Plugin - API SolidFire .. SUCCESS [3.174s]
[INFO] Apache CloudStack Plugin - API Discovery .. SUCCESS [4.677s]
[INFO] Apache CloudStack Plugin - ACL Static Role Based .. SUCCESS [2.954s]
[INFO] Apache CloudStack Plugin - Host Anti-Affinity Processor  SUCCESS [3.043s]
[INFO] Apache CloudStack Plugin - Explicit Dedication Processor  SUCCESS 
[2.977s]
[INFO] Apache CloudStack Plugin - User Concentrated Pod Deployment Planner  
SUCCESS [3.036s]
[INFO] Apache CloudStack Plugin - User Dispersing Deployment Planner  SUCCESS 
[2.846s]
[INFO] Apache CloudStack Plugin - Implicit Dedication Planner  SUCCESS [7.343s]
[INFO] Apache CloudStack Plugin - Skip Heurestics Planner  SUCC

cloudstack-cloudmonkey git commit: CHANGES: update changes for 5.3.1

2015-02-26 Thread bhaisaab 
Repository: cloudstack-cloudmonkey
Updated Branches:
  refs/heads/master 39f53acc0 -> 7b66d3937


CHANGES: update changes for 5.3.1

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/7b66d393
Tree: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/7b66d393
Diff: 
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/7b66d393

Branch: refs/heads/master
Commit: 7b66d39376d2711443a4b91af8375bdf3ae690b5
Parents: 39f53ac
Author: Rohit Yadav 
Authored: Thu Feb 26 16:08:46 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 16:08:46 2015 +0530

--
 CHANGES.md | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/7b66d393/CHANGES.md
--
diff --git a/CHANGES.md b/CHANGES.md
index 82f98cf..555c029 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -13,6 +13,8 @@ This release includes
 - Importing readline no longer outputs escape characters
 - CloudMonkey will not output extra empty lines in stdout output
 - Filtered result output is uniform across output display formats
+- Async blocked API now show a spinning cursor instead of print dots
+- When finding missing API args, it does case insensitive search
 - New command line arg: -p or --profile (load server profile)
 - New command line arg: -b, --block-async (block and poll result on async API 
calls)
 - New command line arg: -n, --noblock-async (do not block on async API calls)

svn commit: r8134 - /dev/cloudstack/cloudmonkey-5.3.1/

2015-02-26 Thread bhaisaab 
Author: bhaisaab
Date: Thu Feb 26 10:49:10 2015
New Revision: 8134

Log:
Committing release candidate artifacts for 5.3.1 to dist/dev/cloudstack in 
preparation for release vote

Added:

dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2
   (with props)

dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.asc

dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.md5

dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.sha

Added: 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2
==
Binary file - no diff available.

Propchange: 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2
--
svn:mime-type = application/octet-stream

Added: 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.asc
==
--- 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.asc
 (added)
+++ 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.asc
 Thu Feb 26 10:49:10 2015
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: GnuPG v1.4.15 (Darwin)
+
+iQIcBAABAgAGBQJU7vflAAoJEEhCSCEO49iEYbAQAKVBPge4UhjtZFt9xFYZZwgM
+jdBuTIwPEJnBqnC49Ow8Nxi+H4S89P4yfCxSWsWjguVnoWBapYQMxOR4pIgEkECz
+NrKsbtwTXCcXsi9TZcnMUCpUSbcdefWnoXnRete2C5EDDidDVPvnosMAEGhn5QBv
+rXzeE00sdS2b0xyfI6HHF5AhLf+4yBUwy4yh15FEA9MTMvFRPMthOC7lFFZQedBV
+k3swQPY21LueI+jm0TaQHzyOY81MWB4jq2KSa1wSbu4HyThPb/HaigNU+ibieRn5
+h2mPyn31oN3U3c/0tXndEkMORSUMhwek2Ujv0trIgxgLIvm4A2dqWcul9YokgU1k
+5KiVzEfPBlVN0hJDA8iCwdY0XPXaWlMdOumFgqkNCdD4Ad4ccQ0I4Ndp4o+mjys6
+3y/g4Bt2TT/0h4Ij8HYMpga4ieAEuIdPnnlwZcK5Rs0OnXg9iuiZNeasn/EprcbA
+85YjbZaGC8tMZDhVviG/83drhBfz+FQZBs3PvrZPB0P+MLaiKssV2RiM+eaIxsC4
+Ua16vKKZShg/32HTKUa81UbusZe8O3rn9oFkqHP5DzAdg54OtRhJ8gmfddi8mj6j
+QFjwE2hyCKsoT3/E9vu2pEjTQ+Njx9/AfwqEAFvFJm9Xlcbmy9GNQa1tgll/kJxI
+Hgbxf7LuYNZBv0079Gm2
+=Zg5T
+-END PGP SIGNATURE-

Added: 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.md5
==
--- 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.md5
 (added)
+++ 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.md5
 Thu Feb 26 10:49:10 2015
@@ -0,0 +1,2 @@
+apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2: 
+E6 B9 5C E0 9F 30 1E 99  1F 43 6C E3 F1 17 41 82

Added: 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.sha
==
--- 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.sha
 (added)
+++ 
dev/cloudstack/cloudmonkey-5.3.1/apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2.sha
 Thu Feb 26 10:49:10 2015
@@ -0,0 +1,3 @@
+apache-cloudstack-cloudmonkey-5.3.1-src.tar.bz2: 
+6CB37D90 4ECD9276 601A08CB D8B86797 CF564900 AAD90651 D7DBF6BC DC77C5B0 
1AE94E16
+ BA1741BC C9E1D768 D92397EF AD8C9E25 1406498F 613A9755 B10DC2AA

git commit: updated refs/heads/4.5 to cb08707

2015-02-26 Thread bhaisaab 
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 985a61652 -> cb08707ad


CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb08707a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb08707a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb08707a

Branch: refs/heads/4.5
Commit: cb08707addbffa12abc50aec9ad980059f23910c
Parents: 985a616
Author: Rohit Yadav 
Authored: Thu Feb 26 17:42:21 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 17:42:21 2015 +0530

--
 .../baremetal/manager/BaremetalVlanManager.java |  4 -
 .../manager/BaremetalVlanManagerImpl.java   | 11 +--
 .../src/com/cloud/user/AccountManagerImpl.java  | 92 ++--
 .../utils/baremetal/BaremetalUtils.java | 24 +
 4 files changed, 77 insertions(+), 54 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb08707a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
--
diff --git 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
index 76f1052..b6311f7 100755
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
@@ -27,11 +27,7 @@ import com.cloud.vm.VirtualMachineProfile;
 import org.apache.cloudstack.api.AddBaremetalRctCmd;
 import org.apache.cloudstack.api.DeleteBaremetalRctCmd;
 
-/**
- * Created by frank on 4/30/14.
- */
 public interface BaremetalVlanManager extends Manager, PluggableService {
-public static final String BAREMETAL_SYSTEM_ACCOUNT_NAME = 
"baremetal-system-account";
 
 BaremetalRctResponse addRct(AddBaremetalRctCmd cmd);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb08707a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
--
diff --git 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
index 97d993e..56c31bb 100755
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
@@ -43,6 +43,7 @@ import org.apache.cloudstack.api.AddBaremetalRctCmd;
 import org.apache.cloudstack.api.DeleteBaremetalRctCmd;
 import org.apache.cloudstack.api.ListBaremetalRctCmd;
 import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.utils.baremetal.BaremetalUtils;
 import org.springframework.web.client.RestTemplate;
 
 import javax.inject.Inject;
@@ -235,14 +236,14 @@ public class BaremetalVlanManagerImpl extends ManagerBase 
implements BaremetalVl
 @Override
 public boolean start() {
 QueryBuilder acntq = QueryBuilder.create(AccountVO.class);
-acntq.and(acntq.entity().getAccountName(), SearchCriteria.Op.EQ, 
BaremetalVlanManager.BAREMETAL_SYSTEM_ACCOUNT_NAME);
+acntq.and(acntq.entity().getAccountName(), SearchCriteria.Op.EQ, 
BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
 AccountVO acnt = acntq.find();
 if (acnt != null) {
 return true;
 }
 
 acnt = new AccountVO();
-acnt.setAccountName(BAREMETAL_SYSTEM_ACCOUNT_NAME);
+acnt.setAccountName(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
 acnt.setUuid(UUID.randomUUID().toString());
 acnt.setState(Account.State.enabled);
 acnt.setDomainId(1);
@@ -252,9 +253,9 @@ public class BaremetalVlanManagerImpl extends ManagerBase 
implements BaremetalVl
 user.setState(Account.State.enabled);
 user.setUuid(UUID.randomUUID().toString());
 user.setAccountId(acnt.getAccountId());
-user.setUsername(BAREMETAL_SYSTEM_ACCOUNT_NAME);
-user.setFirstname(BAREMETAL_SYSTEM_ACCOUNT_NAME);
-user.setLastname(BAREMETAL_SYSTEM_ACCOUNT_NAME);
+user.setUsername(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
+user.setFirstname(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
+user.setLastname(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
 user.setPassword(UUID.randomUUID().toString());
 user = userDao.persist(user);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cb08707a/server/src/com/cloud/user/AccountManagerI

git commit: updated refs/heads/master to 6df2fe7

2015-02-26 Thread bhaisaab 
Repository: cloudstack
Updated Branches:
  refs/heads/master f39319932 -> 6df2fe7a8


CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user

Signed-off-by: Rohit Yadav 
(cherry picked from commit cb08707addbffa12abc50aec9ad980059f23910c)
Signed-off-by: Rohit Yadav 

Conflicts:
server/src/com/cloud/user/AccountManagerImpl.java


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6df2fe7a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6df2fe7a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6df2fe7a

Branch: refs/heads/master
Commit: 6df2fe7a8ad70a10b4584391d1c56fc03ff0f85b
Parents: f393199
Author: Rohit Yadav 
Authored: Thu Feb 26 17:42:21 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 17:47:01 2015 +0530

--
 .../baremetal/manager/BaremetalVlanManager.java |  4 -
 .../manager/BaremetalVlanManagerImpl.java   | 11 +--
 .../src/com/cloud/user/AccountManagerImpl.java  | 93 ++--
 .../utils/baremetal/BaremetalUtils.java | 24 +
 4 files changed, 77 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6df2fe7a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
--
diff --git 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
index 76f1052..b6311f7 100644
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
@@ -27,11 +27,7 @@ import com.cloud.vm.VirtualMachineProfile;
 import org.apache.cloudstack.api.AddBaremetalRctCmd;
 import org.apache.cloudstack.api.DeleteBaremetalRctCmd;
 
-/**
- * Created by frank on 4/30/14.
- */
 public interface BaremetalVlanManager extends Manager, PluggableService {
-public static final String BAREMETAL_SYSTEM_ACCOUNT_NAME = 
"baremetal-system-account";
 
 BaremetalRctResponse addRct(AddBaremetalRctCmd cmd);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6df2fe7a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
--
diff --git 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
index a77cf35..3169597 100644
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
@@ -43,6 +43,7 @@ import org.apache.cloudstack.api.AddBaremetalRctCmd;
 import org.apache.cloudstack.api.DeleteBaremetalRctCmd;
 import org.apache.cloudstack.api.ListBaremetalRctCmd;
 import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.utils.baremetal.BaremetalUtils;
 import org.springframework.web.client.RestTemplate;
 
 import javax.inject.Inject;
@@ -235,14 +236,14 @@ public class BaremetalVlanManagerImpl extends ManagerBase 
implements BaremetalVl
 @Override
 public boolean start() {
 QueryBuilder acntq = QueryBuilder.create(AccountVO.class);
-acntq.and(acntq.entity().getAccountName(), SearchCriteria.Op.EQ, 
BaremetalVlanManager.BAREMETAL_SYSTEM_ACCOUNT_NAME);
+acntq.and(acntq.entity().getAccountName(), SearchCriteria.Op.EQ, 
BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
 AccountVO acnt = acntq.find();
 if (acnt != null) {
 return true;
 }
 
 acnt = new AccountVO();
-acnt.setAccountName(BAREMETAL_SYSTEM_ACCOUNT_NAME);
+acnt.setAccountName(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
 acnt.setUuid(UUID.randomUUID().toString());
 acnt.setState(Account.State.enabled);
 acnt.setDomainId(1);
@@ -252,9 +253,9 @@ public class BaremetalVlanManagerImpl extends ManagerBase 
implements BaremetalVl
 user.setState(Account.State.enabled);
 user.setUuid(UUID.randomUUID().toString());
 user.setAccountId(acnt.getAccountId());
-user.setUsername(BAREMETAL_SYSTEM_ACCOUNT_NAME);
-user.setFirstname(BAREMETAL_SYSTEM_ACCOUNT_NAME);
-user.setLastname(BAREMETAL_SYSTEM_ACCOUNT_NAME);
+user.setUsername(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
+user.setFirstname(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
+user.setLastname(BaremetalUtils.BAREMETAL_SYSTEM_ACCOUNT_NAME);
 user.setPassword(UUID.

git commit: updated refs/heads/master to 4dde410

2015-02-26 Thread bhaisaab 
Repository: cloudstack
Updated Branches:
  refs/heads/master 6df2fe7a8 -> 4dde4106c


server: Add missing import, fixes build

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4dde4106
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4dde4106
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4dde4106

Branch: refs/heads/master
Commit: 4dde4106c0c37e0aa1597bfeac0cbd82c181dbe2
Parents: 6df2fe7
Author: Rohit Yadav 
Authored: Thu Feb 26 17:49:55 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 17:49:55 2015 +0530

--
 server/src/com/cloud/user/AccountManagerImpl.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4dde4106/server/src/com/cloud/user/AccountManagerImpl.java
--
diff --git a/server/src/com/cloud/user/AccountManagerImpl.java 
b/server/src/com/cloud/user/AccountManagerImpl.java
index bced7b3..78a8733 100644
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -147,6 +147,7 @@ import javax.crypto.spec.SecretKeySpec;
 import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
+import java.net.InetAddress;
 import java.net.URLEncoder;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;

git commit: updated refs/heads/master to d8e1bf1

2015-02-26 Thread bhaisaab 
Repository: cloudstack
Updated Branches:
  refs/heads/master 4dde4106c -> d8e1bf150


CLOUDSTACK-7089: don't log VNC password

Signed-off-by: Rohit Yadav 
(cherry picked from commit e287de9fd90a06ee7f86d31ba69a84481f0820f1)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d8e1bf15
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d8e1bf15
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d8e1bf15

Branch: refs/heads/master
Commit: d8e1bf15062bb2d4bbd4dd3ae1d32697ce1053b5
Parents: 4dde410
Author: Rohit Yadav 
Authored: Thu Feb 26 18:10:23 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 18:11:12 2015 +0530

--
 server/src/com/cloud/consoleproxy/AgentHookBase.java  | 2 +-
 server/src/com/cloud/servlet/ConsoleProxyServlet.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8e1bf15/server/src/com/cloud/consoleproxy/AgentHookBase.java
--
diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java 
b/server/src/com/cloud/consoleproxy/AgentHookBase.java
index 8a5bae5..b61ba13 100644
--- a/server/src/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java
@@ -146,7 +146,7 @@ public abstract class AgentHookBase implements AgentHook {
 
 String sid = cmd.getSid();
 if (sid == null || !sid.equals(vm.getVncPassword())) {
-s_logger.warn("sid " + sid + " in url does not match stored sid " 
+ vm.getVncPassword());
+s_logger.warn("sid " + sid + " in url does not match stored sid.");
 return new ConsoleAccessAuthenticationAnswer(cmd, false);
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d8e1bf15/server/src/com/cloud/servlet/ConsoleProxyServlet.java
--
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java 
b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index d08bcdb..3389d92 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -317,7 +317,7 @@ public class ConsoleProxyServlet extends HttpServlet {
 
 String sid = req.getParameter("sid");
 if (sid == null || !sid.equals(vm.getVncPassword())) {
-s_logger.warn("sid " + sid + " in url does not match stored sid " 
+ vm.getVncPassword());
+s_logger.warn("sid " + sid + " in url does not match stored sid.");
 sendResponse(resp, "failed");
 return;
 }

git commit: updated refs/heads/4.4 to 72d78e5

2015-02-26 Thread bhaisaab 
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 14a00679b -> 72d78e57c


CLOUDSTACK-7089: don't log VNC password

Signed-off-by: Rohit Yadav 
(cherry picked from commit e287de9fd90a06ee7f86d31ba69a84481f0820f1)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/72d78e57
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/72d78e57
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/72d78e57

Branch: refs/heads/4.4
Commit: 72d78e57c8338130b19192a9bdfd5839575d62e4
Parents: 14a0067
Author: Rohit Yadav 
Authored: Thu Feb 26 18:10:23 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 18:11:28 2015 +0530

--
 server/src/com/cloud/consoleproxy/AgentHookBase.java  | 2 +-
 server/src/com/cloud/servlet/ConsoleProxyServlet.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/72d78e57/server/src/com/cloud/consoleproxy/AgentHookBase.java
--
diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java 
b/server/src/com/cloud/consoleproxy/AgentHookBase.java
index 9dfffd4..e9fd4e5 100644
--- a/server/src/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java
@@ -145,7 +145,7 @@ public abstract class AgentHookBase implements AgentHook {
 
 String sid = cmd.getSid();
 if (sid == null || !sid.equals(vm.getVncPassword())) {
-s_logger.warn("sid " + sid + " in url does not match stored sid " 
+ vm.getVncPassword());
+s_logger.warn("sid " + sid + " in url does not match stored sid.");
 return new ConsoleAccessAuthenticationAnswer(cmd, false);
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/72d78e57/server/src/com/cloud/servlet/ConsoleProxyServlet.java
--
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java 
b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index 1053aa2..6b657d0 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -313,7 +313,7 @@ public class ConsoleProxyServlet extends HttpServlet {
 
 String sid = req.getParameter("sid");
 if (sid == null || !sid.equals(vm.getVncPassword())) {
-s_logger.warn("sid " + sid + " in url does not match stored sid " 
+ vm.getVncPassword());
+s_logger.warn("sid " + sid + " in url does not match stored sid.");
 sendResponse(resp, "failed");
 return;
 }

git commit: updated refs/heads/4.5 to e287de9

2015-02-26 Thread bhaisaab 
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 cb08707ad -> e287de9fd


CLOUDSTACK-7089: don't log VNC password

Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e287de9f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e287de9f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e287de9f

Branch: refs/heads/4.5
Commit: e287de9fd90a06ee7f86d31ba69a84481f0820f1
Parents: cb08707
Author: Rohit Yadav 
Authored: Thu Feb 26 18:10:23 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 18:10:23 2015 +0530

--
 server/src/com/cloud/consoleproxy/AgentHookBase.java  | 2 +-
 server/src/com/cloud/servlet/ConsoleProxyServlet.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e287de9f/server/src/com/cloud/consoleproxy/AgentHookBase.java
--
diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java 
b/server/src/com/cloud/consoleproxy/AgentHookBase.java
index 8a5bae5..b61ba13 100644
--- a/server/src/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java
@@ -146,7 +146,7 @@ public abstract class AgentHookBase implements AgentHook {
 
 String sid = cmd.getSid();
 if (sid == null || !sid.equals(vm.getVncPassword())) {
-s_logger.warn("sid " + sid + " in url does not match stored sid " 
+ vm.getVncPassword());
+s_logger.warn("sid " + sid + " in url does not match stored sid.");
 return new ConsoleAccessAuthenticationAnswer(cmd, false);
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e287de9f/server/src/com/cloud/servlet/ConsoleProxyServlet.java
--
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java 
b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index 4694a47..23f25c5 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -311,7 +311,7 @@ public class ConsoleProxyServlet extends HttpServlet {
 
 String sid = req.getParameter("sid");
 if (sid == null || !sid.equals(vm.getVncPassword())) {
-s_logger.warn("sid " + sid + " in url does not match stored sid " 
+ vm.getVncPassword());
+s_logger.warn("sid " + sid + " in url does not match stored sid.");
 sendResponse(resp, "failed");
 return;
 }

git commit: updated refs/heads/4.3 to d7988f1

2015-02-26 Thread bhaisaab 
Repository: cloudstack
Updated Branches:
  refs/heads/4.3 9c0ed73b8 -> d7988f17b


CLOUDSTACK-7089: don't log VNC password

Signed-off-by: Rohit Yadav 
(cherry picked from commit e287de9fd90a06ee7f86d31ba69a84481f0820f1)
Signed-off-by: Rohit Yadav 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d7988f17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d7988f17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d7988f17

Branch: refs/heads/4.3
Commit: d7988f17b0f5bb67d2619d81145f0e4f9e737519
Parents: 9c0ed73
Author: Rohit Yadav 
Authored: Thu Feb 26 18:10:23 2015 +0530
Committer: Rohit Yadav 
Committed: Thu Feb 26 18:11:43 2015 +0530

--
 server/src/com/cloud/consoleproxy/AgentHookBase.java  | 2 +-
 server/src/com/cloud/servlet/ConsoleProxyServlet.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d7988f17/server/src/com/cloud/consoleproxy/AgentHookBase.java
--
diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java 
b/server/src/com/cloud/consoleproxy/AgentHookBase.java
index aa9e4f8..711348d 100644
--- a/server/src/com/cloud/consoleproxy/AgentHookBase.java
+++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java
@@ -154,7 +154,7 @@ public abstract class AgentHookBase implements AgentHook {
 
 String sid = cmd.getSid();
 if (sid == null || !sid.equals(vm.getVncPassword())) {
-s_logger.warn("sid " + sid + " in url does not match stored sid " 
+ vm.getVncPassword());
+s_logger.warn("sid " + sid + " in url does not match stored sid.");
 return new ConsoleAccessAuthenticationAnswer(cmd, false);
 }
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d7988f17/server/src/com/cloud/servlet/ConsoleProxyServlet.java
--
diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java 
b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
index 24ea07f..f79a972 100644
--- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java
+++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java
@@ -306,7 +306,7 @@ public class ConsoleProxyServlet extends HttpServlet {
 
 String sid = req.getParameter("sid");
 if (sid == null || !sid.equals(vm.getVncPassword())) {
-s_logger.warn("sid " + sid + " in url does not match stored sid " 
+ vm.getVncPassword());
+s_logger.warn("sid " + sid + " in url does not match stored sid.");
 sendResponse(resp, "failed");
 return;
 }

Jenkins build is back to normal : cloudstack-apidocs-master #1825

2015-02-26 Thread Apache Jenkins Server 
See

git commit: updated refs/heads/4.4 to 10bb8af

2015-02-26 Thread dahn 
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 72d78e57c -> 10bb8af34


CLOUDSTACK-7760 Data disk size is not considering for primary storage resource 
limit check


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/10bb8af3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/10bb8af3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/10bb8af3

Branch: refs/heads/4.4
Commit: 10bb8af343c99e2b1fd00d1560714ce7f7ee4318
Parents: 72d78e5
Author: Bharat Kumar 
Authored: Fri Oct 17 11:24:40 2014 +0530
Committer: Daan Hoogland 
Committed: Thu Feb 26 17:30:27 2015 +0100

--
 server/src/com/cloud/vm/UserVmManagerImpl.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/10bb8af3/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index 93e99eb..0499a90 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -2621,6 +2621,7 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 throw new InvalidParameterValueException("VM Creation 
failed. Volume size: " + diskSize + "GB is out of allowed range. Max: " + 
customDiskOfferingMaxSize
 + " Min:" + customDiskOfferingMinSize);
 }
+size=size+diskSize*(1024*1024*1024);
 }
 size += _diskOfferingDao.findById(diskOfferingId).getDiskSize();
 }