Remove 0002-Revert-Switch-over-to-oslosphinx.patch

Change-Id: Idd92709b711c97bc4306ea44915a32e00705b67f

diff --git a/.gitreview b/.gitreview
index 47994b7c4dc4595f83ecb84c145c75af3a4a71c0..8e0a5a34215a24ad68e440cdd5dddfeaf10e3d51 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,5 +1,5 @@
 [gerrit]
 host=gerrit.mirantis.com
-project=openstack/cinder.git
+project=openstack-ci/openstack/cinder-build.git
 defaultremote=gerrit-mirantis
-defaultbranch=openstack-ci/build/grizzly
+defaultbranch=master

diff --git a/rpm/SOURCES/0002-Revert-Switch-over-to-oslosphinx.patch b/rpm/SOURCES/0002-Revert-Switch-over-to-oslosphinx.patch
deleted file mode 100644 (file)
index f4437c1..0000000
--- a/rpm/SOURCES/0002-Revert-Switch-over-to-oslosphinx.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 15cc208adf811d9a83e8f820fb4be775c5db9a00 Mon Sep 17 00:00:00 2001
-From: Eric Harney <eharney@redhat.com>
-Date: Thu, 27 Mar 2014 14:24:57 -0400
-Subject: [PATCH] Revert "Switch over to oslosphinx"
-
-This reverts commit ea7d4a599224b5d0c7674d03993bbe72c49f0d51.
----
- doc/source/conf.py    | 2 +-
- test-requirements.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/source/conf.py b/doc/source/conf.py
-index ac2eadc..238a922 100644
---- a/doc/source/conf.py
-+++ b/doc/source/conf.py
-@@ -34,7 +34,7 @@ extensions = ['sphinx.ext.autodoc',
-               'sphinx.ext.pngmath',
-               'sphinx.ext.ifconfig',
-               'sphinx.ext.graphviz',
--              'oslosphinx',
-+              'oslo.sphinx',
-               ]
- 
- # autodoc generation is a bit aggressive and a nuisance
-diff --git a/test-requirements.txt b/test-requirements.txt
-index 56746da..15308b9 100644
---- a/test-requirements.txt
-+++ b/test-requirements.txt
-@@ -13,4 +13,4 @@ sphinx>=1.1.2,<1.2
- python-subunit>=0.0.18
- testtools>=0.9.34
- testrepository>=0.0.18
--oslosphinx
-+oslo.sphinx

diff --git a/rpm/SPECS/openstack-cinder.spec b/rpm/SPECS/openstack-cinder.spec
index 2c30b2deb9a730ea2d496bade78999e1394cf447..63719318e363f19a0e5f8e136ef93e0bb2cf7e7e 100644 (file)
--- a/rpm/SPECS/openstack-cinder.spec
+++ b/rpm/SPECS/openstack-cinder.spec
@@ -24,7 +24,6 @@ Source20:         cinder-sudoers
 # patches_base=2014.1.1
 #
 Patch0001: 0001-Remove-runtime-dep-on-python-pbr-python-d2to1.patch
-Patch0002: 0002-Revert-Switch-over-to-oslosphinx.patch
 
 BuildArch:        noarch
 BuildRequires:    intltool
@@ -142,7 +141,6 @@ This package contains documentation files for cinder.
 %setup -q -n cinder-%{version}
 
 %patch0001 -p1
-%patch0002 -p1
 
 find . \( -name .gitignore -o -name .placeholder \) -delete