Return-Path: 
 <cloudstack-commits-return-10460-apmail-incubator-cloudstack-commits-archive=incubator.apache.org@incubator.apache.org>
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 869F3E580
	for <apmail-incubator-cloudstack-commits-archive@minotaur.apache.org>;
 Tue,  5 Feb 2013 20:14:56 +0000 (UTC)
Received: (qmail 52094 invoked by uid 500); 5 Feb 2013 20:14:52 -0000
Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org
Received: (qmail 52019 invoked by uid 500); 5 Feb 2013 20:14:52 -0000
Mailing-List: contact cloudstack-commits-help@incubator.apache.org;
 run by ezmlm
Precedence: bulk
List-Help: <mailto:cloudstack-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:cloudstack-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:cloudstack-commits@incubator.apache.org>
List-Id: <cloudstack-commits.incubator.apache.org>
Reply-To: cloudstack-dev@incubator.apache.org
Delivered-To: mailing list cloudstack-commits@incubator.apache.org
Received: (qmail 51464 invoked by uid 99); 5 Feb 2013 20:14:52 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 05 Feb 2013 20:14:52 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id DD33282A794; Tue,  5 Feb 2013 20:14:51 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: hugo@apache.org
To: cloudstack-commits@incubator.apache.org
X-Mailer: ASF-Git Admin Mailer
Subject: [3/20] git commit: refs/heads/4.1 - Use align phases between the
 various packages. Not very handy to use a tgz file in the generate-resources
 phase when it is created in the package phase (cherry picked from commit
 6c034673a8b712262e9be9b13fe0a2ff0f94216
Message-Id: <20130205201451.DD33282A794@tyr.zones.apache.org>
Date: Tue,  5 Feb 2013 20:14:51 +0000 (UTC)

Use align phases between the various packages. Not very handy to use a tgz file in the generate-resources phase when it is created in the package phase
(cherry picked from commit 6c034673a8b712262e9be9b13fe0a2ff0f942167)

Signed-off-by: Hugo Trippaers <trippie@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3b8b02c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3b8b02c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3b8b02c5

Branch: refs/heads/4.1
Commit: 3b8b02c50c0f9789b4248affe96d1fc81e23ae70
Parents: 3f064ac
Author: Hugo Trippaers <trippie@gmail.com>
Authored: Sat Feb 2 12:19:33 2013 +0100
Committer: Hugo Trippaers <trippie@gmail.com>
Committed: Tue Feb 5 21:05:42 2013 +0100

----------------------------------------------------------------------
 console-proxy/pom.xml |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3b8b02c5/console-proxy/pom.xml
----------------------------------------------------------------------
diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml
index 0e12db0..ab9af16 100644
--- a/console-proxy/pom.xml
+++ b/console-proxy/pom.xml
@@ -125,8 +125,8 @@
         <version>1.7</version>
         <executions>
           <execution>
-            <id>generate-resource</id>
-            <phase>generate-resources</phase>
+            <id>copy-cloud-scripts</id>
+            <phase>package</phase>
             <goals>
               <goal>run</goal>
             </goals>