You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2014/09/25 17:19:27 UTC
[01/10] git commit: updated refs/heads/master to 410092b
Repository: cloudstack
Updated Branches:
refs/heads/master 3a8c45089 -> 410092bbe
CID-1232342: Fix DLS in createOrUpdateRecord in GloboDnsResource
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e70f75d6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e70f75d6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e70f75d6
Branch: refs/heads/master
Commit: e70f75d6caefdf27f65997b027b9bd0812ae4a12
Parents: 3a8c450
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 25 16:40:57 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 16:40:57 2014 +0200
----------------------------------------------------------------------
.../com/globo/globodns/cloudstack/resource/GloboDnsResource.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e70f75d6/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
index c167845..84c1b5b 100644
--- a/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
+++ b/plugins/network-elements/globodns/src/com/globo/globodns/cloudstack/resource/GloboDnsResource.java
@@ -363,7 +363,7 @@ public class GloboDnsResource extends ManagerBase implements ServerResource {
if (record == null) {
// Create new record
record = _globoDns.getRecordAPI().createRecord(domainId, name, ip, type);
- s_logger.info("Created record " + name + " in domain " + domainId);
+ s_logger.info("Created record " + record.getName() + " in domain " + domainId);
} else {
if (!ip.equals(record.getContent())) {
if (Boolean.TRUE.equals(override)) {
[02/10] git commit: updated refs/heads/master to 410092b
Posted by bh...@apache.org.
CID-1223274: Remove dead local storage code from VolumeApiServiceImpl
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/60e492ae
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/60e492ae
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/60e492ae
Branch: refs/heads/master
Commit: 60e492aeb9a9ea53f6e741ec6718c618a9b27aeb
Parents: e70f75d
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 25 16:43:48 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 16:43:48 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/storage/VolumeApiServiceImpl.java | 5 -----
1 file changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/60e492ae/server/src/com/cloud/storage/VolumeApiServiceImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index cf18555..8ccede7 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -291,11 +291,6 @@ public class VolumeApiServiceImpl extends ManagerBase implements VolumeApiServic
throw new IllegalArgumentException("Image format is incorrect " + format + ". Supported formats are " + EnumUtils.listValues(ImageFormat.values()));
}
- String userSpecifiedName = volumeName;
- if (userSpecifiedName == null) {
- userSpecifiedName = getRandomVolumeName();
- }
-
UriUtils.validateUrl(format, url);
[05/10] git commit: updated refs/heads/master to 410092b
Posted by bh...@apache.org.
CID-1211005: Fix comparison, Class<?> is always instance of Class
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/59482b3e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/59482b3e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/59482b3e
Branch: refs/heads/master
Commit: 59482b3eba268570885d64dc9b0527a90cabbc07
Parents: b394680
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 25 16:52:09 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 16:52:09 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/event/ActionEventUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/59482b3e/server/src/com/cloud/event/ActionEventUtils.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/event/ActionEventUtils.java b/server/src/com/cloud/event/ActionEventUtils.java
index 68a328b..2ac4303 100755
--- a/server/src/com/cloud/event/ActionEventUtils.java
+++ b/server/src/com/cloud/event/ActionEventUtils.java
@@ -301,7 +301,7 @@ public class ActionEventUtils {
try{
Object key = entry.getKey();
Class<?> clz = Class.forName((String)key);
- if(clz instanceof Class && Identity.class.isAssignableFrom(clz)){
+ if(clz != null && Identity.class.isAssignableFrom(clz)){
String uuid = getEntityUuid(clz, entry.getValue());
eventDescription.put(ReflectUtil.getEntityName(clz), uuid);
}
[09/10] git commit: updated refs/heads/master to 410092b
Posted by bh...@apache.org.
CID-1192798: Remove unused boolean variable
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6e06ae9e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6e06ae9e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6e06ae9e
Branch: refs/heads/master
Commit: 6e06ae9e8ea879e892d6311761a6042fa78cea3f
Parents: f74446a
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 25 17:03:47 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 17:03:47 2014 +0200
----------------------------------------------------------------------
.../org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6e06ae9e/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
index e2f261e..e5e5017 100644
--- a/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
@@ -155,10 +155,9 @@ public class CreateVPCCmd extends BaseAsyncCreateCmd {
@Override
public void execute() {
Vpc vpc = null;
- boolean success = true;
try {
if (isStart()) {
- success = _vpcService.startVpc(getEntityId(), true);
+ _vpcService.startVpc(getEntityId(), true);
} else {
s_logger.debug("Not starting VPC as " + ApiConstants.START + "=false was passed to the API");
}
[08/10] git commit: updated refs/heads/master to 410092b
Posted by bh...@apache.org.
CID-1192810: Remove useless control flow
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f74446a1
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f74446a1
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f74446a1
Branch: refs/heads/master
Commit: f74446a195d2a0fa4f1380254416a8a8538a6893
Parents: 92858af
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 25 17:02:13 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 17:02:13 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f74446a1/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
index 146352e..a40a7d7 100755
--- a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
+++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
@@ -519,8 +519,6 @@ StateListener<State, VirtualMachine.Event, VirtualMachine> {
public DeploymentPlanner getDeploymentPlannerByName(String plannerName) {
if (plannerName != null) {
for (DeploymentPlanner plannerInList : _planners) {
- if (plannerName != null) {
- }
if (plannerName.equalsIgnoreCase(plannerInList.getName())) {
return plannerInList;
}
[04/10] git commit: updated refs/heads/master to 410092b
Posted by bh...@apache.org.
CID-1222206: Remove DLS from XenServer56FP1Resource
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b3946802
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b3946802
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b3946802
Branch: refs/heads/master
Commit: b3946802e3a94e60a567fd4cb56f9da8f481ab95
Parents: f40f16b
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 25 16:48:27 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 16:48:27 2014 +0200
----------------------------------------------------------------------
.../hypervisor/xenserver/resource/XenServer56FP1Resource.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b3946802/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
index a119f48..5bef10e 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
@@ -119,11 +119,8 @@ public class XenServer56FP1Resource extends XenServer56Resource {
*/
@Override
protected boolean isDmcEnabled(Connection conn, Host host) throws XenAPIException, XmlRpcException {
- Map<String, String> hostParams = new HashMap<String, String>();
- hostParams = host.getLicenseParams(conn);
-
+ Map<String, String> hostParams = host.getLicenseParams(conn);
Boolean isDmcEnabled = hostParams.get("restrict_dmc").equalsIgnoreCase("false");
-
return isDmcEnabled;
}
}
[10/10] git commit: updated refs/heads/master to 410092b
Posted by bh...@apache.org.
XenServer56FP1Resource: remove unused import
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/410092bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/410092bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/410092bb
Branch: refs/heads/master
Commit: 410092bbe1b81a254a207edf724b7768fcb5a9fc
Parents: 6e06ae9
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 25 17:12:40 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 17:12:40 2014 +0200
----------------------------------------------------------------------
.../cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/410092bb/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
index 5bef10e..eeeb959 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/XenServer56FP1Resource.java
@@ -18,7 +18,6 @@ package com.cloud.hypervisor.xenserver.resource;
import java.io.File;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
[06/10] git commit: updated refs/heads/master to 410092b
Posted by bh...@apache.org.
CLOUDSTACK-7633: fix "Provides" in most LSB headers
In init.d scripts, the LSB header may specify what kind of service is
provided by an init script. If spaces are used, this means the init
script is providing several boot facilities. We fix that by using an
hyphen.
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2401eb92
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2401eb92
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2401eb92
Branch: refs/heads/master
Commit: 2401eb927bbda69f0376d1f34ef20631e1188540
Parents: 59482b3
Author: Vincent Bernat <Vi...@exoscale.ch>
Authored: Thu Sep 25 15:27:50 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 16:56:53 2014 +0200
----------------------------------------------------------------------
agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in | 2 +-
agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in | 2 +-
agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in | 2 +-
packaging/centos63/cloud-usage.rc | 2 +-
packaging/debian/init/cloud-agent | 2 +-
packaging/debian/init/cloud-usage | 2 +-
python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +-
python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in | 2 +-
usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +-
usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +-
usage/distro/opensuse/SYSCONFDIR/init.d/cloud-usage.in | 2 +-
usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in | 2 +-
usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in | 2 +-
usage/distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
----------------------------------------------------------------------
diff --git a/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
index 741317b..3a1d053 100644
--- a/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
+++ b/agent/distro/opensuse/sles/SYSCONFDIR/init.d/cloud-agent.in
@@ -1,6 +1,6 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud agent
+# Provides: cloudstack-agent
# Required-Start: $network
# Required-Stop: $network
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
----------------------------------------------------------------------
diff --git a/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
index 741317b..3a1d053 100644
--- a/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
+++ b/agent/distro/sles/SYSCONFDIR/init.d/cloud-agent.in
@@ -1,6 +1,6 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud agent
+# Provides: cloudstack-agent
# Required-Start: $network
# Required-Stop: $network
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
----------------------------------------------------------------------
diff --git a/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in b/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
index 0e87053..c30e526 100755
--- a/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
+++ b/agent/distro/ubuntu/SYSCONFDIR/init.d/cloud-agent.in
@@ -1,7 +1,7 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud agent
+# Provides: cloudstack-agent
# Required-Start: $network $local_fs
# Required-Stop: $network $local_fs
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/packaging/centos63/cloud-usage.rc
----------------------------------------------------------------------
diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc
index 9e3d6d6..7741137 100755
--- a/packaging/centos63/cloud-usage.rc
+++ b/packaging/centos63/cloud-usage.rc
@@ -1,7 +1,7 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud usage
+# Provides: cloudstack-usage
# Required-Start: $network $local_fs
# Required-Stop: $network $local_fs
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/packaging/debian/init/cloud-agent
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-agent b/packaging/debian/init/cloud-agent
index eb2c3d1..7e4e7d0 100755
--- a/packaging/debian/init/cloud-agent
+++ b/packaging/debian/init/cloud-agent
@@ -1,7 +1,7 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud agent
+# Provides: cloudstack-agent
# Required-Start: $network $local_fs
# Required-Stop: $network $local_fs
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/packaging/debian/init/cloud-usage
----------------------------------------------------------------------
diff --git a/packaging/debian/init/cloud-usage b/packaging/debian/init/cloud-usage
index d193918..e6129c2 100755
--- a/packaging/debian/init/cloud-usage
+++ b/packaging/debian/init/cloud-usage
@@ -1,7 +1,7 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloudstack usage
+# Provides: cloudstack-usage
# Required-Start: $network $local_fs
# Required-Stop: $network $local_fs
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in
----------------------------------------------------------------------
diff --git a/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in
index 558f5a2..51b4f58 100755
--- a/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in
+++ b/python/distro/opensuse/SYSCONFDIR/init.d/cloud-ipallocator.in
@@ -17,7 +17,7 @@
# under the License.
### BEGIN INIT INFO
-# Provides: cloud ipallocator
+# Provides: cloudstack-ipallocator
# Required-Start: $network
# Required-Stop: $network
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
----------------------------------------------------------------------
diff --git a/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in b/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
index 558f5a2..51b4f58 100755
--- a/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
+++ b/python/distro/sles/SYSCONFDIR/init.d/cloud-ipallocator.in
@@ -17,7 +17,7 @@
# under the License.
### BEGIN INIT INFO
-# Provides: cloud ipallocator
+# Provides: cloudstack-ipallocator
# Required-Start: $network
# Required-Stop: $network
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
----------------------------------------------------------------------
diff --git a/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
index cb5beb5..cd12a1c 100755
--- a/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
+++ b/usage/distro/centos/SYSCONFDIR/rc.d/init.d/cloud-usage.in
@@ -1,7 +1,7 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud usage
+# Provides: cloudstack-usage
# Required-Start: $network $local_fs
# Required-Stop: $network $local_fs
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
----------------------------------------------------------------------
diff --git a/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
index cb5beb5..cd12a1c 100755
--- a/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
+++ b/usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in
@@ -1,7 +1,7 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud usage
+# Provides: cloudstack-usage
# Required-Start: $network $local_fs
# Required-Stop: $network $local_fs
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/usage/distro/opensuse/SYSCONFDIR/init.d/cloud-usage.in
----------------------------------------------------------------------
diff --git a/usage/distro/opensuse/SYSCONFDIR/init.d/cloud-usage.in b/usage/distro/opensuse/SYSCONFDIR/init.d/cloud-usage.in
index f968263..985e2fe 100755
--- a/usage/distro/opensuse/SYSCONFDIR/init.d/cloud-usage.in
+++ b/usage/distro/opensuse/SYSCONFDIR/init.d/cloud-usage.in
@@ -1,7 +1,7 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud usage
+# Provides: cloudstack-usage
# Required-Start: $network $local_fs
# Required-Stop: $network $local_fs
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
----------------------------------------------------------------------
diff --git a/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in b/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
index cb5beb5..cd12a1c 100644
--- a/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
+++ b/usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in
@@ -1,7 +1,7 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud usage
+# Provides: cloudstack-usage
# Required-Start: $network $local_fs
# Required-Stop: $network $local_fs
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in
----------------------------------------------------------------------
diff --git a/usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in b/usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in
index f968263..985e2fe 100755
--- a/usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in
+++ b/usage/distro/sles/SYSCONFDIR/init.d/cloud-usage.in
@@ -1,7 +1,7 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud usage
+# Provides: cloudstack-usage
# Required-Start: $network $local_fs
# Required-Stop: $network $local_fs
# Default-Start: 3 4 5
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2401eb92/usage/distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in
----------------------------------------------------------------------
diff --git a/usage/distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in b/usage/distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in
index f968263..985e2fe 100755
--- a/usage/distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in
+++ b/usage/distro/ubuntu/SYSCONFDIR/init.d/cloud-usage.in
@@ -1,7 +1,7 @@
#!/bin/bash
### BEGIN INIT INFO
-# Provides: cloud usage
+# Provides: cloudstack-usage
# Required-Start: $network $local_fs
# Required-Stop: $network $local_fs
# Default-Start: 3 4 5
[03/10] git commit: updated refs/heads/master to 410092b
Posted by bh...@apache.org.
CID-1223272: Remove DLS code, exceptions and logging handled at lower layers
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f40f16b6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f40f16b6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f40f16b6
Branch: refs/heads/master
Commit: f40f16b61815580717cd8ab0f70109c65c06e7ce
Parents: 60e492a
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 25 16:46:18 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 16:46:18 2014 +0200
----------------------------------------------------------------------
.../cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f40f16b6/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
index 25e6325..b7f33bf 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
@@ -38,10 +38,9 @@ public class CreateVPCCmdByAdmin extends CreateVPCCmd {
@Override
public void execute() {
Vpc vpc = null;
- boolean success = true;
try {
if (isStart()) {
- success = _vpcService.startVpc(getEntityId(), true);
+ _vpcService.startVpc(getEntityId(), true);
} else {
s_logger.debug("Not starting VPC as " + ApiConstants.START + "=false was passed to the API");
}
[07/10] git commit: updated refs/heads/master to 410092b
Posted by bh...@apache.org.
CID-1192822: ids is a List<Long>, the cast to List<?> is removed
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92858afd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92858afd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92858afd
Branch: refs/heads/master
Commit: 92858afd55a2a19cf698bbbf34c891fbf8087e9d
Parents: 2401eb9
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Thu Sep 25 16:59:47 2014 +0200
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Thu Sep 25 16:59:47 2014 +0200
----------------------------------------------------------------------
server/src/com/cloud/api/query/QueryManagerImpl.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/92858afd/server/src/com/cloud/api/query/QueryManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java
index 4f775fc..475b42c 100644
--- a/server/src/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/com/cloud/api/query/QueryManagerImpl.java
@@ -912,11 +912,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService {
sc.setParameters("display", display);
}
- if (ids != null) {
- List<?> idList = (ids instanceof List<?> ? (List<?>)ids : null);
- if (idList != null && !idList.isEmpty()) {
- sc.setParameters("idIN", idList.toArray());
- }
+ if (ids != null && !ids.isEmpty()) {
+ sc.setParameters("idIN", ids.toArray());
}
if (templateId != null) {