cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pdion...@apache.org
Subject [1/5] git commit: add missing files and variables
Date Sun, 21 Sep 2014 15:53:06 GMT
Repository: cloudstack-docs-rn
Updated Branches:
  refs/heads/4.3 2ffd4b24e -> 3c9229719


add missing files and variables


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

Branch: refs/heads/4.3
Commit: 0778f09aa0790f2b8eb8db520cf4082f91756741
Parents: 2ffd4b2
Author: Pierre-Luc Dion <pdion891@apache.org>
Authored: Sun Sep 21 11:00:56 2014 -0400
Committer: Pierre-Luc Dion <pdion891@apache.org>
Committed: Sun Sep 21 11:00:56 2014 -0400

----------------------------------------------------------------------
 source/conf.py                      |  2 +-
 source/global.rst                   | 29 +++++++++++++++++++++++++++++
 source/upgrade/_sysvm_templates.rst |  6 +++---
 3 files changed, 33 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/0778f09a/source/conf.py
----------------------------------------------------------------------
diff --git a/source/conf.py b/source/conf.py
index 01273e3..f2bc8d5 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -75,7 +75,7 @@ copyright = u'2014, Apache CloudStack'
 # The short X.Y version.
 version = '4.3'
 # The full version, including alpha/beta/rc tags.
-release = '4.3.0'
+release = '4.3.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/0778f09a/source/global.rst
----------------------------------------------------------------------
diff --git a/source/global.rst b/source/global.rst
new file mode 100644
index 0000000..bc8f3fc
--- /dev/null
+++ b/source/global.rst
@@ -0,0 +1,29 @@
+.. Licensed to the Apache Software Foundation (ASF) under one
+   or more contributor license agreements.  See the NOTICE file
+   distributed with this work for additional information#
+   regarding copyright ownership.  The ASF licenses this file
+   to you under the Apache License, Version 2.0 (the
+   "License"); you may not use this file except in compliance
+   with the License.  You may obtain a copy of the License at
+   http://www.apache.org/licenses/LICENSE-2.0
+   Unless required by applicable law or agreed to in writing,
+   software distributed under the License is distributed on an
+   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+   KIND, either express or implied.  See the License for the
+   specific language governing permissions and limitations
+   under the License.
+
+
+.. This file contain Variables shared across .rst files in this project
+
+.. _CloudStack Installation Guide: http://docs.cloudstack.apache.org/projects/cloudstack-installation
+.. _CloudStack Administrator's Guide: http://docs.cloudstack.apache.org/projects/cloudstack-administration
+
+
+.. |sysvm64-url-xen|    replace:: http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-xen.vhd.bz2
+.. |sysvm64-url-kvm|    replace:: http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-kvm.qcow2.bz2
+.. |sysvm64-url-vmware| replace:: http://cloudstack.apt-get.eu/systemvm/4.4/systemvm64template-4.4.0-6-vmware.ova
+
+.. |acs43-sysvm64-url-xen|    replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-06-23-master-xen.vhd.bz2
+.. |acs43-sysvm64-url-kvm|    replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-06-23-master-kvm.qcow2.bz2
+.. |acs43-sysvm64-url-vmware| replace:: http://download.cloud.com/templates/4.3/systemvm64template-2014-06-23-master-vmware.ova

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-rn/blob/0778f09a/source/upgrade/_sysvm_templates.rst
----------------------------------------------------------------------
diff --git a/source/upgrade/_sysvm_templates.rst b/source/upgrade/_sysvm_templates.rst
index 28eaef4..3cd8dca 100644
--- a/source/upgrade/_sysvm_templates.rst
+++ b/source/upgrade/_sysvm_templates.rst
@@ -39,7 +39,7 @@ Update System-VM templates
    |                         |                                                          
                                    |
    |                         | Description: systemvm-xenserver-|version|                
                                    |
    |                         |                                                          
                                    |
-   |                         | URL: |sysvm-url-xen|                                     
                                    |
+   |                         | URL: |acs43-sysvm-url-xen|                               
                                    |
    |                         |                                                          
                                    |
    |                         | Zone: Choose the zone where this hypervisor is used      
                                    |
    |                         |                                                          
                                    |
@@ -65,7 +65,7 @@ Update System-VM templates
    |                         |                                                          
                                    |
    |                         | Description: systemvm-kvm-|version|                      
                                    |
    |                         |                                                          
                                    |
-   |                         | URL: |sysvm-url-kvm|                                     
                                    |  
+   |                         | URL: |acs43-sysvm-url-kvm|                               
                                    |  
    |                         |                                                          
                                    |
    |                         | Zone: Choose the zone where this hypervisor is used      
                                    |
    |                         |                                                          
                                    |
@@ -91,7 +91,7 @@ Update System-VM templates
    |                         |                                                          
                                    |
    |                         | Description: systemvm-vmware-|version|                   
                                    |
    |                         |                                                          
                                    |
-   |                         | URL: |sysvm-url-vmware|                                  
                                    |
+   |                         | URL: |acs43-sysvm-url-vmware|                            
                                    |
    |                         |                                                          
                                    |
    |                         | Zone: Choose the zone where this hypervisor is used      
                                    |
    |                         |                                                          
                                    |


Mime
View raw message