summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGage Hugo <gagehugo@gmail.com>2017-03-08 11:02:46 -0600
committerGage Hugo <gagehugo@gmail.com>2017-03-08 11:02:46 -0600
commit126cad8dee7a4455901c5fb56a81cb17a473c2b0 (patch)
tree21a7259034d6f839c82ee94cdc8f003e452873bb
parent124caad93eeeb92f901aca5d899a434809c639a8 (diff)
Remove old comment referencing fixed bug
There was an old comment left regarding this bug: https://bugs.launchpad.net/pbr/+bug/1260495 which was fixed over a year ago but left over. This change removes the comment and related extension and adds the referenced pbr setting. Change-Id: Ib334c136835a9b5b43cabe13b9616cce45e578e0
Notes
Notes (review): Code-Review+2: Lance Bragstad <lbragstad@gmail.com> Code-Review+2: Ron De Rose <ronald.de.rose@intel.com> Workflow+1: Ron De Rose <ronald.de.rose@intel.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Wed, 15 Mar 2017 01:56:27 +0000 Reviewed-on: https://review.openstack.org/443235 Project: openstack/keystonemiddleware Branch: refs/heads/master
-rw-r--r--doc/source/conf.py4
-rw-r--r--setup.cfg4
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 71909b7..a6eb2c4 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -43,10 +43,6 @@ extensions = ['sphinx.ext.autodoc',
43 'sphinx.ext.todo', 43 'sphinx.ext.todo',
44 'sphinx.ext.coverage', 44 'sphinx.ext.coverage',
45 'sphinx.ext.intersphinx', 45 'sphinx.ext.intersphinx',
46 # NOTE(blk-u): Uncomment the [pbr] section in setup.cfg and
47 # remove this Sphinx extension when
48 # https://launchpad.net/bugs/1260495 is fixed.
49 'ext.apidoc',
50 'oslosphinx', 46 'oslosphinx',
51 'oslo_config.sphinxconfiggen' 47 'oslo_config.sphinxconfiggen'
52 ] 48 ]
diff --git a/setup.cfg b/setup.cfg
index dff4e89..96b3104 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -45,6 +45,10 @@ source-dir = doc/source
45build-dir = doc/build 45build-dir = doc/build
46all_files = 1 46all_files = 1
47 47
48[pbr]
49autodoc_tree_index_modules = True
50autodoc_tree_excludes = setup.py
51
48[upload_sphinx] 52[upload_sphinx]
49upload-dir = doc/build/html 53upload-dir = doc/build/html
50 54