Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 82170D107 for ; Thu, 10 Jan 2013 00:59:45 +0000 (UTC) Received: (qmail 33579 invoked by uid 500); 10 Jan 2013 00:59:36 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 33521 invoked by uid 500); 10 Jan 2013 00:59:36 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 32599 invoked by uid 99); 10 Jan 2013 00:59:35 -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, 10 Jan 2013 00:59:35 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E7E53124DD; Thu, 10 Jan 2013 00:59:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mlsorensen@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [20/50] [abbrv] git commit: Merge branch 'master' into api_refactoring Message-Id: <20130110005934.E7E53124DD@tyr.zones.apache.org> Date: Thu, 10 Jan 2013 00:59:34 +0000 (UTC) Merge branch 'master' into api_refactoring Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/0a258842 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/0a258842 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/0a258842 Branch: refs/heads/resizevolume Commit: 0a258842158eb6943dd747d715d65829b604bef8 Parents: 0894822 91673b1 Author: Rohit Yadav Authored: Mon Jan 7 17:28:57 2013 -0800 Committer: Rohit Yadav Committed: Mon Jan 7 17:28:57 2013 -0800 ---------------------------------------------------------------------- agent/pom.xml | 51 +++++++++ packaging/centos63/cloud-agent.rc | 121 +++++++++++++++++++++ packaging/centos63/cloud.spec | 36 ++++++- plugins/hypervisors/kvm/pom.xml | 18 +++ utils/src/com/cloud/utils/script/Script.java | 7 +- 5 files changed, 231 insertions(+), 2 deletions(-) ----------------------------------------------------------------------