cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject git commit: updated refs/heads/master to 7a0cd10
Date Fri, 30 Aug 2013 09:50:55 GMT
Updated Branches:
  refs/heads/master 33c7c654a -> 7a0cd10f8


docs: correcting the links to the wiki

- pointing to the new wiki page on 'How to build CloudStack'. Although
  we shouldnt be using wiki sections on our docs.
- Also formatting the rpms built by cloudstack into a paramlisting


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

Branch: refs/heads/master
Commit: 7a0cd10f853572cda2f3c3aec9db414dbcd98ac6
Parents: 33c7c65
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Fri Aug 30 15:18:17 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Fri Aug 30 15:20:42 2013 +0530

----------------------------------------------------------------------
 docs/en-US/build-nonoss.xml |  4 ++--
 docs/en-US/build-rpm.xml    | 11 ++++++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a0cd10f/docs/en-US/build-nonoss.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/build-nonoss.xml b/docs/en-US/build-nonoss.xml
index fceca60..dbcab99 100644
--- a/docs/en-US/build-nonoss.xml
+++ b/docs/en-US/build-nonoss.xml
@@ -31,9 +31,9 @@ under the License.
     <orderedlist>
         <listitem>
             <para>To build the Non-OSS plugins, you'll need to have the requisite JARs
installed under the <filename>deps</filename> directory.</para>
-            <para>Because these modules require dependencies that can't be distributed
with &PRODUCT; you'll need to download them yourself. Links to the most recent dependencies
are listed on the <ulink url="https://cwiki.apache.org/CLOUDSTACK/how-to-build-on-master-branch.html"><emphasis>How
to build on master branch</emphasis></ulink> page on the wiki.</para></listitem>
+            <para>Because these modules require dependencies that can't be distributed
with &PRODUCT; you'll need to download them yourself. Links to the most recent dependencies
are listed on the <ulink url="https://cwiki.apache.org/confluence/display/CLOUDSTACK/How+to+build+CloudStack"><emphasis>How
to build CloudStack</emphasis></ulink> page on the wiki.</para></listitem>
         <listitem>
-            <para>You may also need to download <ulink url="http://download.cloud.com.s3.amazonaws.com/tools/vhd-util">vhd-util</ulink>,
which was removed due to licensing issues. You'll copy vhd-util to the <filename>scripts/vm/hypervisor/xenserver/</filename>
directory.</para>
+            <para>You may also need to download <ulink url="http://download.cloud.com.s3.amazonaws.com/tools/vhd-util">vhd-util</ulink>
when using XenServer hypervisors, which was removed due to licensing issues. You'll copy vhd-util
to the <filename>scripts/vm/hypervisor/xenserver/</filename> directory.</para>
         </listitem>
         <listitem>
             <para>Once you have all the dependencies copied over, you'll be able to
build &PRODUCT; with the <command>nonoss</command> option:</para>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7a0cd10f/docs/en-US/build-rpm.xml
----------------------------------------------------------------------
diff --git a/docs/en-US/build-rpm.xml b/docs/en-US/build-rpm.xml
index 100a06f..c150742 100644
--- a/docs/en-US/build-rpm.xml
+++ b/docs/en-US/build-rpm.xml
@@ -53,7 +53,16 @@ under the License.
             <programlisting><prompt>$</prompt>./package.sh</programlisting>
         </para>
         <para>That will run for a bit and then place the finished packages in <filename>dist/rpmbuild/RPMS/x86_64/</filename>.</para>
-        <para>You should see seven RPMs in that directory: <filename>cloudstack-agent-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>,
<filename>cloudstack-awsapi-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-cli-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>,
<filename>cloudstack-common-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, <filename>cloudstack-docs-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>,
<filename>cloudstack-management-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>, and
<filename>cloudstack-usage-4.1.0-SNAPSHOT.el6.x86_64.rpm</filename>.</para>
+        <para>You should see seven RPMs in that directory: </para>
+            <programlisting>
+                cloudstack-agent-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-awsapi-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-cli-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-common-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-docs-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-management-4.1.0-SNAPSHOT.el6.x86_64.rpm
+                cloudstack-usage-4.1.0-SNAPSHOT.el6.x86_64.rpm
+            </programlisting>
             <section id="sect-source-buildrpm-repo">
                 <title>Creating a yum repo</title>
                 <para>


Mime
View raw message