You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ed...@apache.org on 2014/03/28 01:39:21 UTC
[12/28] git commit: updated refs/heads/4.4 to 392dc81
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/18f59f9c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/18f59f9c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/18f59f9c
Branch: refs/heads/4.4
Commit: 18f59f9ce82c545b5335152ab573df16fd143a39
Parents: 04220da
Author: edison <su...@gmail.com>
Authored: Mon Jan 6 11:41:18 2014 -0800
Committer: Edison Su <su...@gmail.com>
Committed: Thu Mar 27 17:38:38 2014 -0700
----------------------------------------------------------------------
.../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/18f59f9c/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 ae217b6..e326f61 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
@@ -99,8 +99,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/18f59f9c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 02b1808..c608c4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,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>6.2.0-1-SNAPSHOT</cs.xapi.version>
<cs.httpclient.version>3.1</cs.httpclient.version>