Return-Path: 
 <commits-return-30440-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 658E2100A0
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Thu, 29 Aug 2013 09:08:57 +0000 (UTC)
Received: (qmail 44318 invoked by uid 500); 29 Aug 2013 09:08:57 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 44131 invoked by uid 500); 29 Aug 2013 09:08:57 -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 44119 invoked by uid 99); 29 Aug 2013 09:08:56 -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, 29 Aug 2013 09:08:56 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 7C5768C68A8; Thu, 29 Aug 2013 09:08:56 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: radhika@apache.org
To: commits@cloudstack.apache.org
Date: Thu, 29 Aug 2013 09:08:56 -0000
Message-Id: <c5b2d067e19844bcb1860867f90708f2@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/2] git commit: updated refs/heads/4.2 to f07cdd5

Updated Branches:
  refs/heads/4.2 a0d4888f8 -> f07cdd592


Before 4.X TO 4.2 upgrade manually clean up /var/cache/cloudstack


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

Branch: refs/heads/4.2
Commit: b5e8198f7d3a3c8d9e27849348bb0c2dd9c8b74d
Parents: a0d4888
Author: radhikap <radhika.puthiyetath@citrix.com>
Authored: Thu Aug 29 14:29:15 2013 +0530
Committer: radhikap <radhika.puthiyetath@citrix.com>
Committed: Thu Aug 29 14:33:08 2013 +0530

----------------------------------------------------------------------
 docs/en-US/Release_Notes.xml | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5e8198f/docs/en-US/Release_Notes.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml
index 4c5195b..2ae0b24 100644
--- a/docs/en-US/Release_Notes.xml
+++ b/docs/en-US/Release_Notes.xml
@@ -21,7 +21,7 @@ under the License.
 <book>
   <xi:include href="Book_Info_Release_Notes_4-0.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
   <xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
-  <chapter id="welcome-4.1">
+  <chapter id="welcome-4.2">
     <title>Welcome to &PRODUCT; 4.2</title>
     <para>Welcome to the 4.2.0 release of &PRODUCT;, the second major release from the Apache
       CloudStack project since its graduation from the Apache Incubator. &PRODUCT; 4.2 includes more
@@ -578,6 +578,8 @@ under the License.
             of Linux's predominant package systems, RPM or APT. This guide assumes you'll be using
             RPM and Yum (for Red Hat Enterprise Linux or CentOS), or APT and Debian packages (for
             Ubuntu).</para>
+        </listitem>
+        <listitem>
           <para>Create RPM or Debian packages (as appropriate) and a repository from the 4.2.0
             source, or check the Apache CloudStack downloads page at <ulink
               url="http://cloudstack.apache.org/downloads.html"
@@ -764,8 +766,11 @@ service cloudstack-agent restart
             as hosts and only on the KVM hosts.</para>
           <orderedlist numeration="loweralpha">
             <listitem>
-              <para>Copy the CloudPlatform 4.2 tar file to the host, untar it, and change directory
-                to the resulting directory.</para>
+              <para>Manually clean up <filename>/var/cache/cloudstack</filename>.</para>
+            </listitem>
+            <listitem>
+              <para>Copy the 4.2 tar file to the host, untar it, and change directory to the
+                resulting directory.</para>
             </listitem>
             <listitem>
               <para>Stop the running agent.</para>
@@ -1267,10 +1272,7 @@ service cloudstack-agent start
               <para><command># apt-get update</command></para>
               <para><command># apt-get upgrade cloud-*</command></para>
             </listitem>
-            <listitem>
-              <para>Start the agent.</para>
-              <programlisting># service cloudstack-agent start</programlisting>
-            </listitem>
+            
             <listitem>
               <para>Edit <filename>/etc/cloudstack/agent/agent.properties</filename> to change the
                 resource parameter from
@@ -1279,6 +1281,7 @@ service cloudstack-agent start
             </listitem>
             <listitem>
               <para>Start the cloud agent and cloud management services.</para>
+              <programlisting># service cloudstack-agent start</programlisting>
             </listitem>
             <listitem>
               <para>When the Management Server is up and running, log in to the CloudStack UI and
@@ -1294,7 +1297,6 @@ service cloudstack-agent start
             <para>Troubleshooting: If login fails, clear your browser cache and reload the
               page.</para>
           </note>
-          <para/>
           <para>Do not proceed to the next step until the hosts show in Up state.</para>
         </listitem>
         <listitem>