Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC48910DEA for ; Mon, 6 Jan 2014 19:42:59 +0000 (UTC) Received: (qmail 53297 invoked by uid 500); 6 Jan 2014 19:42:58 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 53268 invoked by uid 500); 6 Jan 2014 19:42:58 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 53232 invoked by uid 99); 6 Jan 2014 19:42:58 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Jan 2014 19:42:58 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 7E3B7882C00; Mon, 6 Jan 2014 19:42:58 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: edison@apache.org To: commits@cloudstack.apache.org Message-Id: <62e803225aa44fcba23f14545fd8e6f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/4.3 to e542aef Date: Mon, 6 Jan 2014 19:42:58 +0000 (UTC) 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 Authored: Mon Jan 6 11:41:18 2014 -0800 Committer: edison 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 @@ 1.9.0 build213-svnkit-1.3-patch 2.6.6 - 1.7.1 + 1.7.2 14.0-rc1 5.6.100-1-SNAPSHOT 3.1