You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2012/08/12 22:20:34 UTC
[45/50] [abbrv] Merge branch 'master' into vpc
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/048c5e50/server/src/com/cloud/configuration/Config.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/048c5e50/server/src/com/cloud/network/NetworkManagerImpl.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/048c5e50/server/src/com/cloud/network/element/BareMetalElement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/048c5e50/server/src/com/cloud/network/element/CloudZonesNetworkElement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/048c5e50/server/src/com/cloud/network/element/VirtualRouterElement.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/048c5e50/server/src/com/cloud/user/AccountManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/user/AccountManagerImpl.java
index 38153f3,1631482..6531498
--- a/server/src/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/com/cloud/user/AccountManagerImpl.java
@@@ -255,7 -239,10 +255,10 @@@ public class AccountManagerImpl impleme
if (_userAuthenticators == null || !_userAuthenticators.isSet()) {
s_logger.error("Unable to find an user authenticator.");
}
-
+
+ //initialize admin context
+ UserContext.setAdminContext(new UserContext(getSystemUser().getId(), getSystemAccount(), null, false));
+
return true;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/048c5e50/server/src/com/cloud/vm/UserVmManagerImpl.java
----------------------------------------------------------------------
diff --cc server/src/com/cloud/vm/UserVmManagerImpl.java
index 82693e9,4a0a8d9..7a70eb0
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@@ -1369,8 -1368,8 +1370,8 @@@ public class UserVmManagerImpl implemen
if(snapshot.getHypervisorType() == HypervisorType.VMware && snapshotVolume.getVolumeType() == Type.DATADISK){
throw new UnsupportedServiceException("operation not supported, snapshot with id " + snapshotId + " is created from Data Disk");
}
- */
+ */
-
+
hyperType = snapshot.getHypervisorType();
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/048c5e50/ui/scripts/ui/widgets/multiEdit.js
----------------------------------------------------------------------