Return-Path: 
 <commits-return-24951-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
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 8FC11E584
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Mon, 24 Jun 2013 23:51:38 +0000 (UTC)
Received: (qmail 82249 invoked by uid 500); 24 Jun 2013 23:51:38 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 82198 invoked by uid 500); 24 Jun 2013 23:51:38 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 82132 invoked by uid 99); 24 Jun 2013 23:51:38 -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, 24 Jun 2013 23:51:38 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id C7F2982F59E; Mon, 24 Jun 2013 23:51:37 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: ahuang@apache.org
To: commits@cloudstack.apache.org
Date: Mon, 24 Jun 2013 23:51:39 -0000
Message-Id: <7b6d52063aa740079774c1d2a023f111@git.apache.org>
In-Reply-To: <6053f9ef3d3046c9b32fcf382af8d360@git.apache.org>
References: <6053f9ef3d3046c9b32fcf382af8d360@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [03/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

CLOUDSTACK-1999: Fix cloud/cloudstack due to new packaging


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

Branch: refs/heads/vmsync
Commit: 2e06da552c9561c0ec8612d47b39e66b78bf1cb3
Parents: 5bfae23
Author: Sebastien Goasguen <runseb@gmail.com>
Authored: Wed Apr 17 12:24:52 2013 -0400
Committer: Joe Brockmeier <jzb@zonker.net>
Committed: Sun Jun 23 13:48:26 2013 -0500

----------------------------------------------------------------------
 docs/en-US/about-password-encryption.xml             | 2 +-
 docs/en-US/management-server-install-db-external.xml | 2 +-
 docs/en-US/management-server-install-db-local.xml    | 4 ++--
 docs/en-US/management-server-install-multi-node.xml  | 4 ++--
 docs/en-US/region-add.xml                            | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/about-password-encryption.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/about-password-encryption.xml b/docs/en-US/about-password-encryption.xml
index 6c11c57..a13ff60 100644
--- a/docs/en-US/about-password-encryption.xml
+++ b/docs/en-US/about-password-encryption.xml
@@ -60,6 +60,6 @@
     over a known port.</para>
   <para>The encryption type, database secret key, and Management Server secret key are set during
     &PRODUCT; installation. They are all parameters to the &PRODUCT; database setup script
-    (cloud-setup-databases). The default values are file, password, and password. It is, of course,
+    (cloudstack-setup-databases). The default values are file, password, and password. It is, of course,
     highly recommended that you change these to more secure keys.</para>
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/management-server-install-db-external.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-db-external.xml b/docs/en-US/management-server-install-db-external.xml
index a28dee5..2950720 100644
--- a/docs/en-US/management-server-install-db-external.xml
+++ b/docs/en-US/management-server-install-db-external.xml
@@ -132,7 +132,7 @@ bind-address = 0.0.0.0</programlisting>
              server node IP. If not specified, the local IP address will be used.</para>
         </listitem>
       </itemizedlist>
-      <programlisting language="Bash">cloud-setup-databases cloud:&lt;dbpassword&gt;@&lt;ip address mysql server&gt; \
+      <programlisting language="Bash">cloudstack-setup-databases cloud:&lt;dbpassword&gt;@&lt;ip address mysql server&gt; \
 --deploy-as=root:&lt;password&gt; \
 -e &lt;encryption_type&gt; \
 -m &lt;management_server_key&gt; \

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/management-server-install-db-local.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-db-local.xml b/docs/en-US/management-server-install-db-local.xml
index 310327f..ff5ab60 100644
--- a/docs/en-US/management-server-install-db-local.xml
+++ b/docs/en-US/management-server-install-db-local.xml
@@ -135,7 +135,7 @@ binlog-format = 'ROW'</programlisting>
             server node IP. If not specified, the local IP address will be used.</para>
         </listitem>
       </itemizedlist>
-      <programlisting language="Bash">cloud-setup-databases cloud:&lt;dbpassword&gt;@localhost \
+      <programlisting language="Bash">cloudstack-setup-databases cloud:&lt;dbpassword&gt;@localhost \
 --deploy-as=root:&lt;password&gt; \
 -e &lt;encryption_type&gt; \
 -m &lt;management_server_key&gt; \
@@ -160,7 +160,7 @@ binlog-format = 'ROW'</programlisting>
     <listitem>
       <para>Now that the database is set up, you can finish configuring the OS for the Management
         Server. This command will set up iptables, sudoers, and start the Management Server.</para>
-      <programlisting><prompt>#</prompt> cloud-setup-management</programlisting>
+      <programlisting><prompt>#</prompt> cloudstack-setup-management</programlisting>
       <para>You should see the message “&PRODUCT; Management Server setup is done.”</para>
     </listitem>
   </orderedlist>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/management-server-install-multi-node.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-multi-node.xml b/docs/en-US/management-server-install-multi-node.xml
index 21cf28f..ae925bf 100644
--- a/docs/en-US/management-server-install-multi-node.xml
+++ b/docs/en-US/management-server-install-multi-node.xml
@@ -53,12 +53,12 @@ linkend="sect-source-buildrpm"/> or <xref linkend="sect-source-builddebs"/> as
       <para>Configure the database client. Note the absence of the --deploy-as argument in this
         case. (For more details about the arguments to this command, see <xref
           linkend="management-server-install-db-external"/>.) </para>
-      <programlisting><prompt>#</prompt> cloud-setup-databases cloud:<replaceable>dbpassword</replaceable>@<replaceable>dbhost</replaceable> -e <replaceable>encryption_type</replaceable> -m <replaceable>management_server_key</replaceable> -k <replaceable>database_key</replaceable> -i <replaceable>management_server_ip</replaceable>
+      <programlisting><prompt>#</prompt> cloudstack-setup-databases cloud:<replaceable>dbpassword</replaceable>@<replaceable>dbhost</replaceable> -e <replaceable>encryption_type</replaceable> -m <replaceable>management_server_key</replaceable> -k <replaceable>database_key</replaceable> -i <replaceable>management_server_ip</replaceable>
       </programlisting>
     </listitem>
     <listitem>
       <para>Configure the OS and start the Management Server:</para>
-      <programlisting><prompt>#</prompt> cloud-setup-management</programlisting>
+      <programlisting><prompt>#</prompt> cloudstack-setup-management</programlisting>
       <para>The Management Server on this node should now be running.</para>
     </listitem>
     <listitem>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/region-add.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/region-add.xml b/docs/en-US/region-add.xml
index 960777c..802e462 100644
--- a/docs/en-US/region-add.xml
+++ b/docs/en-US/region-add.xml
@@ -45,7 +45,7 @@
                     the additional command-line flag <code>-r &lt;region_id&gt;</code> to set a
                     region ID for the new region. The default region is automatically assigned a
                     region ID of 1, so your first additional region might be region 2.</para>
-      <programlisting>cloud-setup-databases cloud:&lt;dbpassword&gt;@localhost --deploy-as=root:&lt;password&gt; -e &lt;encryption_type&gt; -m &lt;management_server_key&gt; -k &lt;database_key&gt; -r &lt;region_id&gt;</programlisting>
+      <programlisting>cloudstack-setup-databases cloud:&lt;dbpassword&gt;@localhost --deploy-as=root:&lt;password&gt; -e &lt;encryption_type&gt; -m &lt;management_server_key&gt; -k &lt;database_key&gt; -r &lt;region_id&gt;</programlisting>
       </listitem>
       <listitem><para>By the end of the installation procedure, the Management Server should have been started. Be sure that the Management Server installation was successful and complete.</para></listitem>
       <listitem><para>Add region 2 to region 1. Use the API command addRegion. (For information about how to make an API call, see the Developer's Guide.)</para>
@@ -82,7 +82,7 @@
             However, you must repeat certain steps additional times for each additional region:</para>
         <orderedlist>
             <listitem><para>Install &PRODUCT; in each additional region. Set the region ID for each region during the database setup step.</para>
-                <programlisting>cloud-setup-databases cloud:&lt;dbpassword&gt;@localhost --deploy-as=root:&lt;password&gt; -e &lt;encryption_type&gt; -m &lt;management_server_key&gt; -k &lt;database_key&gt; -r &lt;region_id&gt;</programlisting></listitem>
+                <programlisting>cloudstack-setup-databases cloud:&lt;dbpassword&gt;@localhost --deploy-as=root:&lt;password&gt; -e &lt;encryption_type&gt; -m &lt;management_server_key&gt; -k &lt;database_key&gt; -r &lt;region_id&gt;</programlisting></listitem>
             <listitem><para>Once the Management Server is running, add your new region to all existing regions by
                     repeatedly calling the API command addRegion. For example, if you were adding
                     region 3:</para>
@@ -125,4 +125,4 @@ http://&lt;IP_of_region_3_Management_Server&gt;:8080/client/api?command=addRegio
 
 http://&lt;IP_of_region_2_Management_Server&gt;:8080/client/api?command=removeRegion&amp;id=3&amp;apiKey=miVr6X7u6bN_sdahOBpjNejPgEsT35eXq-jB8CG20YI3yaxXcgpyuaIRmFI_EJTVwZ0nUkkJbPmY3y2bciKwFQ&amp;signature=Lxx1DM40AjcXU%2FcaiK8RAP0O1hU%3D</programlisting>
     </section>
-</section>
\ No newline at end of file
+</section>