summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-03-08 01:17:28 +0000
committerGerrit Code Review <review@openstack.org>2018-03-08 01:17:29 +0000
commitf9b4f2d453bd851b9d6242fecbba8412aed7952a (patch)
treedd71663bc1809fc923844e290bbcd488a22128d3
parentbd4b3c5dc9256fc0d6cca8f925705740c2395efd (diff)
parentf482904f8ee1a95ae0d90436138526ac19ba44b4 (diff)
downloadswift-f9b4f2d453bd851b9d6242fecbba8412aed7952a.tar.gz
Merge "Update install-guide URLs to point to stable/queens" into stable/queens
-rw-r--r--doc/source/install/controller-install-debian.rst2
-rw-r--r--doc/source/install/controller-install-rdo.rst2
-rw-r--r--doc/source/install/controller-install-ubuntu.rst2
-rw-r--r--doc/source/install/finalize-installation-rdo.rst2
-rw-r--r--doc/source/install/finalize-installation-ubuntu-debian.rst2
-rw-r--r--doc/source/install/storage-install-rdo.rst6
-rw-r--r--doc/source/install/storage-install-ubuntu-debian.rst6
7 files changed, 11 insertions, 11 deletions
diff --git a/doc/source/install/controller-install-debian.rst b/doc/source/install/controller-install-debian.rst
index 55508902d..9ab329476 100644
--- a/doc/source/install/controller-install-debian.rst
+++ b/doc/source/install/controller-install-debian.rst
@@ -47,4 +47,4 @@ Install and configure components
.. code-block:: console
- # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/ocata
+ # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/queens
diff --git a/doc/source/install/controller-install-rdo.rst b/doc/source/install/controller-install-rdo.rst
index 44dd7cc40..db082fd36 100644
--- a/doc/source/install/controller-install-rdo.rst
+++ b/doc/source/install/controller-install-rdo.rst
@@ -45,6 +45,6 @@ Install and configure components
.. code-block:: console
- # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/ocata
+ # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/queens
3. .. include:: controller-include.txt
diff --git a/doc/source/install/controller-install-ubuntu.rst b/doc/source/install/controller-install-ubuntu.rst
index c1bbadf0e..d2c987a46 100644
--- a/doc/source/install/controller-install-ubuntu.rst
+++ b/doc/source/install/controller-install-ubuntu.rst
@@ -47,6 +47,6 @@ Install and configure components
.. code-block:: console
- # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/ocata
+ # curl -o /etc/swift/proxy-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/queens
4. .. include:: controller-include.txt
diff --git a/doc/source/install/finalize-installation-rdo.rst b/doc/source/install/finalize-installation-rdo.rst
index c11969385..893412a5f 100644
--- a/doc/source/install/finalize-installation-rdo.rst
+++ b/doc/source/install/finalize-installation-rdo.rst
@@ -19,7 +19,7 @@ This section applies to Red Hat Enterprise Linux 7 and CentOS 7.
.. code-block:: console
# curl -o /etc/swift/swift.conf \
- https://git.openstack.org/cgit/openstack/swift/plain/etc/swift.conf-sample?h=stable/ocata
+ https://git.openstack.org/cgit/openstack/swift/plain/etc/swift.conf-sample?h=stable/queens
#. Edit the ``/etc/swift/swift.conf`` file and complete the following
actions:
diff --git a/doc/source/install/finalize-installation-ubuntu-debian.rst b/doc/source/install/finalize-installation-ubuntu-debian.rst
index 9ad53d769..4178a77bc 100644
--- a/doc/source/install/finalize-installation-ubuntu-debian.rst
+++ b/doc/source/install/finalize-installation-ubuntu-debian.rst
@@ -19,7 +19,7 @@ This section applies to Ubuntu 14.04 (LTS) and Debian.
.. code-block:: console
# curl -o /etc/swift/swift.conf \
- https://git.openstack.org/cgit/openstack/swift/plain/etc/swift.conf-sample?h=stable/ocata
+ https://git.openstack.org/cgit/openstack/swift/plain/etc/swift.conf-sample?h=stable/queens
#. Edit the ``/etc/swift/swift.conf`` file and complete the following
actions:
diff --git a/doc/source/install/storage-install-rdo.rst b/doc/source/install/storage-install-rdo.rst
index 91a14bd7f..ad2195517 100644
--- a/doc/source/install/storage-install-rdo.rst
+++ b/doc/source/install/storage-install-rdo.rst
@@ -133,9 +133,9 @@ Install and configure components
.. code-block:: console
- # curl -o /etc/swift/account-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/ocata
- # curl -o /etc/swift/container-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/ocata
- # curl -o /etc/swift/object-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/ocata
+ # curl -o /etc/swift/account-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/queens
+ # curl -o /etc/swift/container-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/queens
+ # curl -o /etc/swift/object-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/queens
3. .. include:: storage-include1.txt
4. .. include:: storage-include2.txt
diff --git a/doc/source/install/storage-install-ubuntu-debian.rst b/doc/source/install/storage-install-ubuntu-debian.rst
index 3f62bf2d8..1399e3a52 100644
--- a/doc/source/install/storage-install-ubuntu-debian.rst
+++ b/doc/source/install/storage-install-ubuntu-debian.rst
@@ -137,9 +137,9 @@ Install and configure components
.. code-block:: console
- # curl -o /etc/swift/account-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/ocata
- # curl -o /etc/swift/container-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/ocata
- # curl -o /etc/swift/object-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/ocata
+ # curl -o /etc/swift/account-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/queens
+ # curl -o /etc/swift/container-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/queens
+ # curl -o /etc/swift/object-server.conf https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/queens
3. .. include:: storage-include1.txt
4. .. include:: storage-include2.txt