You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2015/04/29 14:55:00 UTC
[1/2] git commit: updated refs/heads/master to 1669bb9
Repository: cloudstack
Updated Branches:
refs/heads/master 23663c940 -> 1669bb98a
space in log message
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/22e71be0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/22e71be0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/22e71be0
Branch: refs/heads/master
Commit: 22e71be034f102d680d84b079cbb9a3c37c27eb0
Parents: 23663c9
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Apr 29 11:50:32 2015 +0200
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Wed Apr 29 14:54:04 2015 +0200
----------------------------------------------------------------------
.../src/com/cloud/resource/ResourceManagerImpl.java | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/22e71be0/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index 2f6e199..fea950f 100644
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -30,7 +30,11 @@ import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
-import com.cloud.vm.VirtualMachine;
+import org.apache.commons.lang.ObjectUtils;
+import org.apache.log4j.Logger;
+import org.springframework.stereotype.Component;
+
+import com.google.gson.Gson;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd;
@@ -47,9 +51,6 @@ import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.utils.identity.ManagementServerNode;
-import org.apache.commons.lang.ObjectUtils;
-import org.apache.log4j.Logger;
-import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer;
@@ -153,12 +154,12 @@ import com.cloud.utils.db.JoinBuilder;
import com.cloud.utils.db.QueryBuilder;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;
-import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.SearchCriteria.Func;
import com.cloud.utils.db.SearchCriteria.Op;
import com.cloud.utils.db.Transaction;
import com.cloud.utils.db.TransactionCallback;
import com.cloud.utils.db.TransactionCallbackNoReturn;
+import com.cloud.utils.db.TransactionLegacy;
import com.cloud.utils.db.TransactionStatus;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.fsm.NoTransitionException;
@@ -167,10 +168,10 @@ import com.cloud.utils.net.NetUtils;
import com.cloud.utils.ssh.SSHCmdHelper;
import com.cloud.utils.ssh.SshException;
import com.cloud.vm.VMInstanceVO;
+import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.VirtualMachineManager;
import com.cloud.vm.dao.VMInstanceDao;
-import com.google.gson.Gson;
@Component
@Local({ResourceManager.class, ResourceService.class})
@@ -880,7 +881,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
try {
resourceStateTransitTo(host, ResourceState.Event.DeleteHost, _nodeId);
} catch (NoTransitionException e) {
- s_logger.debug("Cannot transmit host " + host.getId() + "to Enabled state", e);
+ s_logger.debug("Cannot transmit host " + host.getId() + " to Enabled state", e);
}
// Delete the associated entries in host ref table
[2/2] git commit: updated refs/heads/master to 1669bb9
Posted by da...@apache.org.
spaces in log message
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1669bb98
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1669bb98
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1669bb98
Branch: refs/heads/master
Commit: 1669bb98a4cfbfffaf2abf21fae6fb14a046fa54
Parents: 22e71be
Author: Daan Hoogland <dh...@schubergphilis.com>
Authored: Wed Apr 29 11:51:42 2015 +0200
Committer: Daan Hoogland <dh...@schubergphilis.com>
Committed: Wed Apr 29 14:54:13 2015 +0200
----------------------------------------------------------------------
server/src/com/cloud/resource/ResourceManagerImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1669bb98/server/src/com/cloud/resource/ResourceManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java
index fea950f..1a2f4e4 100644
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -1166,7 +1166,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
ResourceState currentState = host.getResourceState();
ResourceState nextState = currentState.getNextState(event);
if (nextState == null) {
- throw new NoTransitionException("No next resource state found for current state =" + currentState + " event =" + event);
+ throw new NoTransitionException("No next resource state found for current state = " + currentState + " event = " + event);
}
// TO DO - Make it more granular and have better conversion into capacity type