Return-Path: 
 <commits-return-26565-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 7E7F7101F8
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Fri, 12 Jul 2013 07:51:43 +0000 (UTC)
Received: (qmail 17468 invoked by uid 500); 12 Jul 2013 07:51:27 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 17283 invoked by uid 500); 12 Jul 2013 07:51:24 -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 15553 invoked by uid 99); 12 Jul 2013 07:50:57 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jul 2013 07:50:57 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id E1BCB894A99; Fri, 12 Jul 2013 07:50:56 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: sebgoa@apache.org
To: commits@cloudstack.apache.org
Date: Fri, 12 Jul 2013 07:51:08 -0000
Message-Id: <c8b73f9894874a26a2e45883c8d1ce5e@git.apache.org>
In-Reply-To: <dec7d0bbb86e466aaabbb22841fbee6f@git.apache.org>
References: <dec7d0bbb86e466aaabbb22841fbee6f@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [13/50] git commit: updated refs/heads/sdnextensions to bcfb4e6

[DOC]Change cloud- to cloudstack- for the service and fix script path issue
CLOUDSTACK-3179,CLOUDSTACK-3180

Conflicts:

	docs/en-US/Release_Notes.xml
	docs/en-US/citrix-xenserver-installation.xml


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

Branch: refs/heads/sdnextensions
Commit: 63206d601af9afc0f1001eb23e14ff75e0db62b9
Parents: 73cd064
Author: Gavin Lee <gavin.lxh@gmail.com>
Authored: Tue Jul 9 18:02:32 2013 +0800
Committer: Gavin Lee <gavin.lxh@gmail.com>
Committed: Thu Jul 11 10:51:46 2013 +0800

----------------------------------------------------------------------
 docs/en-US/citrix-xenserver-installation.xml        | 12 ++++++------
 docs/en-US/first_ms_node_install.xml                |  4 ++--
 docs/en-US/host-add-xenserver-kvm-ovm.xml           |  2 +-
 docs/en-US/management-server-install-client.xml     |  2 +-
 docs/en-US/management-server-install-multi-node.xml |  6 ++----
 docs/en-US/management-server-install-systemvm.xml   |  2 +-
 6 files changed, 13 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63206d60/docs/en-US/citrix-xenserver-installation.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/citrix-xenserver-installation.xml b/docs/en-US/citrix-xenserver-installation.xml
index 9ea632a..a50b9bc 100644
--- a/docs/en-US/citrix-xenserver-installation.xml
+++ b/docs/en-US/citrix-xenserver-installation.xml
@@ -555,7 +555,7 @@ master-password=[your password]</programlisting>
         <orderedlist>
           <listitem>
             <para>Copy the script from the Management Server in
-              /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
+              /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
               master host and ensure it is executable.</para>
           </listitem>
           <listitem>
@@ -614,7 +614,7 @@ master-password=[your password]</programlisting>
             <para>Restart the Management Server and Usage Server. You only need to do this once for
               all clusters.</para>
             <programlisting># service cloudstack-management start
-# service cloud-usage start</programlisting>
+# service cloudstack-usage start</programlisting>
           </listitem>
         </orderedlist>
       </listitem>
@@ -679,19 +679,19 @@ vm: b6cf79c8-02ee-050b-922f-49583d9f1a14 (i-2-8-VM)</programlisting>
                 </thead>
                 <tbody>
                   <row>
-                    <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</para></entry>
+                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/xenserver60/NFSSR.py</para></entry>
                     <entry><para>/opt/xensource/sm/NFSSR.py</para></entry>
                   </row>
                   <row>
-                    <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</para></entry>
+                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/setupxenserver.sh</para></entry>
                     <entry><para>/opt/xensource/bin/setupxenserver.sh</para></entry>
                   </row>
                   <row>
-                    <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/make_migratable.sh</para></entry>
+                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/make_migratable.sh</para></entry>
                     <entry><para>/opt/xensource/bin/make_migratable.sh</para></entry>
                   </row>
                   <row>
-                    <entry><para>/usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/cloud-clean-vlan.sh</para></entry>
+                    <entry><para>/usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-clean-vlan.sh</para></entry>
                     <entry><para>/opt/xensource/bin/cloud-clean-vlan.sh</para></entry>
                   </row>
                 </tbody>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63206d60/docs/en-US/first_ms_node_install.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/first_ms_node_install.xml b/docs/en-US/first_ms_node_install.xml
index 3c3e51a..af6b35b 100644
--- a/docs/en-US/first_ms_node_install.xml
+++ b/docs/en-US/first_ms_node_install.xml
@@ -38,8 +38,8 @@
                     <para>
                         Install the &PRODUCT; management server packages by
                         issuing one of the following commands as appropriate: 
-                        <programlisting><prompt>#</prompt> <command>yum</command> install cloud-client</programlisting>
-                        <programlisting><prompt>#</prompt> <command>apt-get</command> install cloud-client</programlisting>
+                        <programlisting><prompt>#</prompt> <command>yum</command> install cloudstack-management</programlisting>
+                        <programlisting><prompt>#</prompt> <command>apt-get</command> install cloudstack-management</programlisting>
                     </para>
                 </listitem>          
                 <listitem>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63206d60/docs/en-US/host-add-xenserver-kvm-ovm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/host-add-xenserver-kvm-ovm.xml b/docs/en-US/host-add-xenserver-kvm-ovm.xml
index 6973dbd..91c36ab 100644
--- a/docs/en-US/host-add-xenserver-kvm-ovm.xml
+++ b/docs/en-US/host-add-xenserver-kvm-ovm.xml
@@ -62,7 +62,7 @@
       <orderedlist>
         <listitem>
           <para>Copy the script from the Management Server in
-            /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
+            /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/cloud-setup-bonding.sh to the
             master host and ensure it is executable.</para>
         </listitem>
         <listitem>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63206d60/docs/en-US/management-server-install-client.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-client.xml b/docs/en-US/management-server-install-client.xml
index 1796142..2c5ded7 100644
--- a/docs/en-US/management-server-install-client.xml
+++ b/docs/en-US/management-server-install-client.xml
@@ -48,6 +48,6 @@
     <para>If the Management Server is RHEL or CentOS, copy vhd-util to
       /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
     <para>If the Management Server is Ubuntu, copy vhd-util to
-      /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver.</para>
+      /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
   </section>
 </section>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63206d60/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 ae925bf..480d84e 100644
--- a/docs/en-US/management-server-install-multi-node.xml
+++ b/docs/en-US/management-server-install-multi-node.xml
@@ -35,10 +35,8 @@ linkend="sect-source-buildrpm"/> or <xref linkend="sect-source-builddebs"/> as
       <para>This step is required only for installations where XenServer is installed on the hypervisor hosts.</para>
       <para>Download vhd-util from <ulink
           url="http://download.cloud.com.s3.amazonaws.com/tools/vhd-util">vhd-util</ulink></para>
-      <para>If the Management Server is RHEL or CentOS, copy vhd-util to
-        /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver.</para>
-      <para>If the Management Server is Ubuntu, copy vhd-util to
-        /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver/vhd-util.</para>
+      <para>Copy vhd-util to
+        /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.</para>
     </listitem>
     <listitem>
       <para> Ensure that necessary services are started and set to start on boot.

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/63206d60/docs/en-US/management-server-install-systemvm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/management-server-install-systemvm.xml b/docs/en-US/management-server-install-systemvm.xml
index 928b956..0d930ad 100644
--- a/docs/en-US/management-server-install-systemvm.xml
+++ b/docs/en-US/management-server-install-systemvm.xml
@@ -59,7 +59,7 @@
         </listitem>
       </itemizedlist>
       <para>On Ubuntu, use the following path instead:</para>
-      <programlisting># /usr/lib/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt</programlisting>
+      <programlisting># /usr/share/cloudstack-common/scripts/storage/secondary/cloud-install-sys-tmplt</programlisting>
     </listitem>
     <listitem>
       <para>If you are using a separate NFS server, perform this step. If you are using the