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 45993D383 for ; Thu, 23 May 2013 18:03:14 +0000 (UTC) Received: (qmail 85631 invoked by uid 500); 23 May 2013 18:03:14 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 85446 invoked by uid 500); 23 May 2013 18:03:13 -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 85427 invoked by uid 99); 23 May 2013 18:03:13 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 May 2013 18:03:13 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 112CE894B75; Thu, 23 May 2013 18:03:13 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mchen@apache.org To: commits@cloudstack.apache.org Message-Id: <0421875c69494d748f51f8c86abee336@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/object_store to 4611b51 Date: Thu, 23 May 2013 18:03:13 +0000 (UTC) Updated Branches: refs/heads/object_store 755b9311a -> 4611b515d Not passing format to VolumeDataStore due to removal of format column from volume_store_ref. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4611b515 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4611b515 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4611b515 Branch: refs/heads/object_store Commit: 4611b515db1368c43787bf9843008e522f9519a0 Parents: 755b931 Author: Min Chen Authored: Thu May 23 11:02:49 2013 -0700 Committer: Min Chen Committed: Thu May 23 11:02:49 2013 -0700 ---------------------------------------------------------------------- .../storage/datastore/db/VolumeDataStoreVO.java | 2 +- .../storage/download/DownloadMonitorImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4611b515/engine/api/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java ---------------------------------------------------------------------- diff --git a/engine/api/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java b/engine/api/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java index 2d72922..7e89de4 100755 --- a/engine/api/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java +++ b/engine/api/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java @@ -205,7 +205,7 @@ public class VolumeDataStoreVO implements StateObject 2)) { downloadJobExists = true;