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 190F51955D for ; Thu, 7 Apr 2016 15:48:32 +0000 (UTC) Received: (qmail 52714 invoked by uid 500); 7 Apr 2016 15:48:30 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 52385 invoked by uid 500); 7 Apr 2016 15:48:30 -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 51969 invoked by uid 99); 7 Apr 2016 15:48:29 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Apr 2016 15:48:29 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B16A7E38EE; Thu, 7 Apr 2016 15:48:29 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bhaisaab@apache.org To: commits@cloudstack.apache.org Date: Thu, 07 Apr 2016 15:48:33 -0000 Message-Id: <76cfbe9b8c384ddcac37ebd48259cce8@git.apache.org> In-Reply-To: <4ba25fda8ace4ef1a3d53d0c84f6a666@git.apache.org> References: <4ba25fda8ace4ef1a3d53d0c84f6a666@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/17] git commit: updated refs/heads/4.9-mvn-upgrade to 0324442 Merge release branch 4.8 to master * 4.8: Add ability to download templates in Swift Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f7c3957a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f7c3957a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f7c3957a Branch: refs/heads/4.9-mvn-upgrade Commit: f7c3957af37d8921ee08ff1e9431cdc3ec08200f Parents: 419f8fb bb82f9a Author: Will Stevens Authored: Wed Apr 6 14:33:39 2016 -0400 Committer: Will Stevens Committed: Wed Apr 6 14:33:39 2016 -0400 ---------------------------------------------------------------------- .../driver/SwiftImageStoreDriverImpl.java | 32 ++++++- .../com/cloud/template/TemplateManagerImpl.java | 6 -- .../main/java/com/cloud/utils/SwiftUtil.java | 76 ++++++++++++++-- .../java/com/cloud/utils/SwiftUtilTest.java | 92 ++++++++++++++++++++ 4 files changed, 193 insertions(+), 13 deletions(-) ----------------------------------------------------------------------