From c811949a0ac5d4c19452af0c0e1117f6b337ee92 Mon Sep 17 00:00:00 2001 From: chenxing Date: Mon, 26 Sep 2016 06:02:58 +0000 Subject: [PATCH] [config-guide] Update swift sample-configuration-files page to newton Master branch focus on stable/newton. These sample files should be consistent with newton release. Change-Id: Id49253ebcf496b66ae7b213cf9064543f72a77b7 --- .../source/object-storage/account-server.rst | 2 +- .../source/object-storage/container-reconciler.rst | 2 +- .../source/object-storage/container-server.rst | 2 +- .../source/object-storage/container-sync-realms.rst | 2 +- doc/config-reference/source/object-storage/memcache.rst | 7 +++++++ .../source/object-storage/object-expirer.rst | 2 +- .../source/object-storage/object-server.rst | 2 +- .../source/object-storage/proxy-server.rst | 2 +- 8 files changed, 14 insertions(+), 7 deletions(-) diff --git a/doc/config-reference/source/object-storage/account-server.rst b/doc/config-reference/source/object-storage/account-server.rst index 6b7c50aa1d..737819e819 100644 --- a/doc/config-reference/source/object-storage/account-server.rst +++ b/doc/config-reference/source/object-storage/account-server.rst @@ -22,4 +22,4 @@ Sample account server configuration file .. remote-code-block:: ini - https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/mitaka + https://git.openstack.org/cgit/openstack/swift/plain/etc/account-server.conf-sample?h=stable/newton diff --git a/doc/config-reference/source/object-storage/container-reconciler.rst b/doc/config-reference/source/object-storage/container-reconciler.rst index 9f6c61c199..7158b6d644 100644 --- a/doc/config-reference/source/object-storage/container-reconciler.rst +++ b/doc/config-reference/source/object-storage/container-reconciler.rst @@ -20,4 +20,4 @@ Sample container sync reconciler configuration file .. remote-code-block:: ini - https://git.openstack.org/cgit/openstack/swift/plain/etc/container-reconciler.conf-sample?h=stable/mitaka + https://git.openstack.org/cgit/openstack/swift/plain/etc/container-reconciler.conf-sample?h=stable/newton diff --git a/doc/config-reference/source/object-storage/container-server.rst b/doc/config-reference/source/object-storage/container-server.rst index 2d812b1efb..a8caff4e71 100644 --- a/doc/config-reference/source/object-storage/container-server.rst +++ b/doc/config-reference/source/object-storage/container-server.rst @@ -23,4 +23,4 @@ Sample container server configuration file .. remote-code-block:: ini - https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/mitaka + https://git.openstack.org/cgit/openstack/swift/plain/etc/container-server.conf-sample?h=stable/newton diff --git a/doc/config-reference/source/object-storage/container-sync-realms.rst b/doc/config-reference/source/object-storage/container-sync-realms.rst index 74d5cccc95..2f885a5ffd 100644 --- a/doc/config-reference/source/object-storage/container-sync-realms.rst +++ b/doc/config-reference/source/object-storage/container-sync-realms.rst @@ -16,4 +16,4 @@ Sample container sync realms configuration file .. remote-code-block:: ini - https://git.openstack.org/cgit/openstack/swift/plain/etc/container-sync-realms.conf-sample?h=stable/mitaka + https://git.openstack.org/cgit/openstack/swift/plain/etc/container-sync-realms.conf-sample?h=stable/newton diff --git a/doc/config-reference/source/object-storage/memcache.rst b/doc/config-reference/source/object-storage/memcache.rst index 09126a4b66..30cf4ec9ff 100644 --- a/doc/config-reference/source/object-storage/memcache.rst +++ b/doc/config-reference/source/object-storage/memcache.rst @@ -8,3 +8,10 @@ at ``etc/memcache.conf-sample`` in the source code repository. The available configuration options are: .. include:: ../tables/swift-memcache-memcache.rst + +Sample proxy server configuration file +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +.. remote-code-block:: ini + + https://git.openstack.org/cgit/openstack/swift/plain/etc/memcache.conf-sample?h=stable/newton diff --git a/doc/config-reference/source/object-storage/object-expirer.rst b/doc/config-reference/source/object-storage/object-expirer.rst index 1744dec6e0..d890b12de2 100644 --- a/doc/config-reference/source/object-storage/object-expirer.rst +++ b/doc/config-reference/source/object-storage/object-expirer.rst @@ -20,4 +20,4 @@ Sample object expirer configuration file .. remote-code-block:: ini - https://git.openstack.org/cgit/openstack/swift/plain/etc/object-expirer.conf-sample?h=stable/mitaka + https://git.openstack.org/cgit/openstack/swift/plain/etc/object-expirer.conf-sample?h=stable/newton diff --git a/doc/config-reference/source/object-storage/object-server.rst b/doc/config-reference/source/object-storage/object-server.rst index 0bd76d302d..d02e4d14eb 100644 --- a/doc/config-reference/source/object-storage/object-server.rst +++ b/doc/config-reference/source/object-storage/object-server.rst @@ -22,4 +22,4 @@ Sample object server configuration file .. remote-code-block:: ini - https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/mitaka + https://git.openstack.org/cgit/openstack/swift/plain/etc/object-server.conf-sample?h=stable/newton diff --git a/doc/config-reference/source/object-storage/proxy-server.rst b/doc/config-reference/source/object-storage/proxy-server.rst index 55103009ef..2542c41bda 100644 --- a/doc/config-reference/source/object-storage/proxy-server.rst +++ b/doc/config-reference/source/object-storage/proxy-server.rst @@ -29,4 +29,4 @@ Sample proxy server configuration file .. remote-code-block:: ini - https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/mitaka + https://git.openstack.org/cgit/openstack/swift/plain/etc/proxy-server.conf-sample?h=stable/newton