cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [24/24] git commit: updated refs/heads/master to 81ff479
Date Thu, 26 Sep 2013 01:01:28 GMT
fix compile errors


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

Branch: refs/heads/master
Commit: 81ff4795df4f58b9ddc0c3d03ef833c756fd5b54
Parents: a9aad4f
Author: Edison Su <sudison@gmail.com>
Authored: Wed Sep 25 17:59:54 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Wed Sep 25 17:59:54 2013 -0700

----------------------------------------------------------------------
 .../src/com/cloud/vm/VirtualMachineManagerImpl.java            | 6 ------
 .../datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java | 2 +-
 server/src/com/cloud/user/AccountManagerImpl.java              | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81ff4795/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
----------------------------------------------------------------------
diff --git a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 3829336..af6ca6d 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -1203,14 +1203,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements
VirtualMac
 
         } catch (AgentUnavailableException e) {
             s_logger.warn("Unable to stop vm, agent unavailable: " + e.toString());
-            if (!forced) {
-                throw e;
-            }
         } catch (OperationTimedoutException e) {
             s_logger.warn("Unable to stop vm, operation timed out: " + e.toString());
-            if (!forced) {
-                throw e;
-            }
         } finally {
             if (!stopped) {
                 if (!cleanUpEvenIfUnableToStop) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81ff4795/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
----------------------------------------------------------------------
diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
index 96d3ac0..3eaeb1f 100644
--- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
+++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java
@@ -26,7 +26,6 @@ import com.cloud.agent.api.to.DataStoreTO;
 import com.cloud.agent.api.to.DataTO;
 import com.cloud.agent.api.to.StorageFilerTO;
 import com.cloud.configuration.Config;
-import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.exception.StorageUnavailableException;
 import com.cloud.host.dao.HostDao;
 import com.cloud.storage.DataStoreRole;
@@ -44,6 +43,7 @@ import com.cloud.utils.NumbersUtil;
 import com.cloud.vm.dao.VMInstanceDao;
 
 import org.apache.cloudstack.engine.orchestration.service.VolumeOrchestrationService;
+import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.engine.subsystem.api.storage.*;
 import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
 import org.apache.cloudstack.storage.command.CommandResult;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81ff4795/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 9a03590..396319a 100755
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@ -857,7 +857,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager,
M
     @DB
     @ActionEvents({
         @ActionEvent(eventType = EventTypes.EVENT_ACCOUNT_CREATE, eventDescription = "creating
Account"),
-        @ActionEvent(eventType = EventTypes.EVENT_USER_CREATE, eventDescription = "creating
User"),
+        @ActionEvent(eventType = EventTypes.EVENT_USER_CREATE, eventDescription = "creating
User")
     })
     public UserAccount createUserAccount(String userName, String password, String firstName,
String lastName, String email, String timezone, String accountName, short accountType,
                                          Long domainId, String networkDomain, Map<String,
String> details, String accountUUID, String userUUID) {


Mime
View raw message