From 3771be482001cdf180d4572fe003d50b0a04a1eb Mon Sep 17 00:00:00 2001 From: Brian Rosmaita Date: Fri, 21 Aug 2020 16:55:11 -0400 Subject: [PATCH] Retarget specs for Wallaby As agreed on at the Cinder R-9 mid-cycle meeting. Change-Id: Id7a4af7e9ee3f98f9f661dd5500b15c519c51d22 --- doc/source/_extra/.htaccess | 10 ++++++---- doc/test/redirect-tests.txt | 10 ++++++---- specs/{victoria => wallaby}/image-encryption.rst | 0 specs/wallaby/remove-me.rst | 6 ------ ...pe-and-availability_zone-for-backup-restore-API.rst | 2 +- 5 files changed, 13 insertions(+), 15 deletions(-) rename specs/{victoria => wallaby}/image-encryption.rst (100%) delete mode 100644 specs/wallaby/remove-me.rst rename specs/{newton => wallaby}/specify-volume_type-and-availability_zone-for-backup-restore-API.rst (99%) diff --git a/doc/source/_extra/.htaccess b/doc/source/_extra/.htaccess index 909a4247..b62ada09 100644 --- a/doc/source/_extra/.htaccess +++ b/doc/source/_extra/.htaccess @@ -1,6 +1,8 @@ # This file contains redirects to handle existing URLs for specs # that have been moved -Redirect 301 /specs/train/image-encryption.rst /specs/victoria/image-encryption.rst -Redirect 301 /specs/ussuri/image-encryption.rst /specs/victoria/image-encryption.rst -Redirect 301 /specs/train/support-glance-multiple-backend.rst /specs/ussuri/support-glance-multiple-backend.rst -Redirect 301 /specs/train/query-cinder-resources-filter-by-time-comparison-operators.rst /specs/ussuri/query-cinder-resources-filter-by-time-comparison-operators.rst +Redirect 301 /specs/train/image-encryption.html /specs/wallaby/image-encryption.html +Redirect 301 /specs/ussuri/image-encryption.html /specs/wallaby/image-encryption.html +Redirect 301 /specs/victoria/image-encryption.html /specs/wallaby/image-encryption.html +Redirect 301 /specs/train/support-glance-multiple-backend.html /specs/ussuri/support-glance-multiple-backend.html +Redirect 301 /specs/train/query-cinder-resources-filter-by-time-comparison-operators.html /specs/ussuri/query-cinder-resources-filter-by-time-comparison-operators.html +Redirect 301 /specs/newton/specify-volume_type-and-availability_zone-for-backup-restore-API.html /specs/wallaby/specify-volume_type-and-availability_zone-for-backup-restore-API.html diff --git a/doc/test/redirect-tests.txt b/doc/test/redirect-tests.txt index 9dffd6d1..67b2b5fa 100644 --- a/doc/test/redirect-tests.txt +++ b/doc/test/redirect-tests.txt @@ -1,7 +1,9 @@ # This file contains tests for redirects to handle existing URLs for # specs that have been moved. See # https://docs.openstack.org/whereto/latest/ for details. -/specs/train/image-encryption.rst 301 /specs/victoria/image-encryption.rst -/specs/ussuri/image-encryption.rst 301 /specs/victoria/image-encryption.rst -/specs/train/support-glance-multiple-backend.rst 301 /specs/ussuri/support-glance-multiple-backend.rst -/specs/train/query-cinder-resources-filter-by-time-comparison-operators.rst 301 /specs/ussuri/query-cinder-resources-filter-by-time-comparison-operators.rst +/specs/train/image-encryption.html 301 /specs/wallaby/image-encryption.html +/specs/ussuri/image-encryption.html 301 /specs/wallaby/image-encryption.html +/specs/victoria/image-encryption.html 301 /specs/wallaby/image-encryption.html +/specs/train/support-glance-multiple-backend.html 301 /specs/ussuri/support-glance-multiple-backend.html +/specs/train/query-cinder-resources-filter-by-time-comparison-operators.html 301 /specs/ussuri/query-cinder-resources-filter-by-time-comparison-operators.html +/specs/newton/specify-volume_type-and-availability_zone-for-backup-restore-API.html 301 /specs/wallaby/specify-volume_type-and-availability_zone-for-backup-restore-API.html diff --git a/specs/victoria/image-encryption.rst b/specs/wallaby/image-encryption.rst similarity index 100% rename from specs/victoria/image-encryption.rst rename to specs/wallaby/image-encryption.rst diff --git a/specs/wallaby/remove-me.rst b/specs/wallaby/remove-me.rst deleted file mode 100644 index ae861e3b..00000000 --- a/specs/wallaby/remove-me.rst +++ /dev/null @@ -1,6 +0,0 @@ -.. This file is a place holder. It should be removed by - any patch proposing a spec for the Wallaby release - -================================ -No specs have yet been approved. -================================ diff --git a/specs/newton/specify-volume_type-and-availability_zone-for-backup-restore-API.rst b/specs/wallaby/specify-volume_type-and-availability_zone-for-backup-restore-API.rst similarity index 99% rename from specs/newton/specify-volume_type-and-availability_zone-for-backup-restore-API.rst rename to specs/wallaby/specify-volume_type-and-availability_zone-for-backup-restore-API.rst index 27b90376..6f03003f 100644 --- a/specs/newton/specify-volume_type-and-availability_zone-for-backup-restore-API.rst +++ b/specs/wallaby/specify-volume_type-and-availability_zone-for-backup-restore-API.rst @@ -139,7 +139,7 @@ Assignee(s) ----------- Primary assignee: - + alan-bishop Other contributors: