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/4.3 to e542aef
Date Mon, 06 Jan 2014 19:42:58 GMT
Updated Branches:
  refs/heads/4.3 8619394ab -> e542aefdc


CLOUDSTACK-5573: bump gson version to 1.7.2, fix https://code.google.com/p/google-gson/issues/detail?id=354


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

Branch: refs/heads/4.3
Commit: e542aefdc8a532f44638069b56e0613e54dd0945
Parents: 8619394
Author: edison <sudison@gmail.com>
Authored: Mon Jan 6 11:41:18 2014 -0800
Committer: edison <sudison@gmail.com>
Committed: Mon Jan 6 11:42:26 2014 -0800

----------------------------------------------------------------------
 .../datastore/driver/CloudStackPrimaryDataStoreDriverImpl.java     | 2 --
 pom.xml                                                            | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e542aefd/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 f1690fd..b4d24d8 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
@@ -77,8 +77,6 @@ public class CloudStackPrimaryDataStoreDriverImpl implements PrimaryDataStoreDri
     @Inject
     StorageManager storageMgr;
     @Inject
-    VolumeOrchestrationService volumeMgr;
-    @Inject
     VMInstanceDao vmDao;
     @Inject
     SnapshotDao snapshotDao;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e542aefd/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 31946d8..940eee3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
     <cs.jasypt.version>1.9.0</cs.jasypt.version>
     <cs.trilead.version>build213-svnkit-1.3-patch</cs.trilead.version>
     <cs.ehcache.version>2.6.6</cs.ehcache.version>
-    <cs.gson.version>1.7.1</cs.gson.version>
+    <cs.gson.version>1.7.2</cs.gson.version>
     <cs.guava.version>14.0-rc1</cs.guava.version>
     <cs.xapi.version>5.6.100-1-SNAPSHOT</cs.xapi.version>
     <cs.httpclient.version>3.1</cs.httpclient.version>


Mime
View raw message