cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject git commit: updated refs/heads/master to 143fbc3
Date Fri, 01 Nov 2013 23:02:45 GMT
Updated Branches:
  refs/heads/master 31ec4191c -> 143fbc37a


fix build


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

Branch: refs/heads/master
Commit: 143fbc37a682c344773961c0038c6d902c9d4aef
Parents: 31ec419
Author: Edison Su <sudison@gmail.com>
Authored: Fri Nov 1 16:02:24 2013 -0700
Committer: Edison Su <sudison@gmail.com>
Committed: Fri Nov 1 16:02:24 2013 -0700

----------------------------------------------------------------------
 .../cloudstack/core/spring-engine-storage-core-context.xml         | 1 +
 .../network/contrail/management/IntegrationTestConfiguration.java  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/143fbc37/engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml
----------------------------------------------------------------------
diff --git a/engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml
b/engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml
index 76ec23e..b17e410 100644
--- a/engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml
+++ b/engine/storage/resources/META-INF/cloudstack/core/spring-engine-storage-core-context.xml
@@ -37,6 +37,7 @@
     <bean id="BAREMETAL" class="org.apache.cloudstack.storage.image.format.BAREMETAL"
/>
     
     <bean id="hypervisorHelperImpl" class="org.apache.cloudstack.storage.helper.HypervisorHelperImpl"
/>
+    <bean id="vmSnapshotHelper" class="org.apache.cloudstack.storage.vmsnapshot.VMSnapshotHelperImpl"
/>
 
     <bean id="objectInDataStoreManagerImpl"
         class="org.apache.cloudstack.storage.datastore.ObjectInDataStoreManagerImpl" />

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/143fbc37/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
----------------------------------------------------------------------
diff --git a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
index 7c8d516..dec4a9e 100644
--- a/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
+++ b/plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/IntegrationTestConfiguration.java
@@ -484,7 +484,7 @@ import org.apache.cloudstack.network.contrail.management.ServerEventHandlerImpl;
         VpcOfferingServiceMapDaoImpl.class,
         VpcServiceMapDaoImpl.class,
         VpcVirtualNetworkApplianceManagerImpl.class,
-        VpnUserDaoImpl.class,
+        VpnUserDaoImpl.class
 },
 includeFilters={@Filter(value=IntegrationTestConfiguration.ComponentFilter.class, type=FilterType.CUSTOM)},
 useDefaultFilters=false)


Mime
View raw message