Merge ~daniel-thewatkins/cloud-init/+git/cloud-init:doc into cloud-init:master

Proposed by Dan Watkins on 2019-08-08
Status: Merged
Approved by: Dan Watkins on 2019-08-08
Approved revision: bb3af40dc828aa11fefe88b3905472eb01153503
Merge reported by: Server Team CI bot
Merged at revision: not available
Proposed branch: ~daniel-thewatkins/cloud-init/+git/cloud-init:doc
Merge into: cloud-init:master
Diff against target: 20 lines (+0/-5)
1 file modified
doc/rtd/conf.py (+0/-5)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve on 2019-08-08
Ryan Harper 2019-08-08 Approve on 2019-08-08
Review via email: mp+371090@code.launchpad.net

Commit message

doc: remove intersphinx extension

We don't use it in our doc builds, and if sphinx.pocoo.org is down then
it causes doc build issues.

To post a comment you must log in.
Ryan Harper (raharper) wrote :

Nice find.

review: Approve

PASSED: Continuous integration, rev:bb3af40dc828aa11fefe88b3905472eb01153503
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1034/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/1034//rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/doc/rtd/conf.py b/doc/rtd/conf.py
2index 50eb05c..4174477 100644
3--- a/doc/rtd/conf.py
4+++ b/doc/rtd/conf.py
5@@ -27,16 +27,11 @@ project = 'Cloud-Init'
6 # Add any Sphinx extension module names here, as strings. They can be
7 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
8 extensions = [
9- 'sphinx.ext.intersphinx',
10 'sphinx.ext.autodoc',
11 'sphinx.ext.autosectionlabel',
12 'sphinx.ext.viewcode',
13 ]
14
15-intersphinx_mapping = {
16- 'sphinx': ('http://sphinx.pocoo.org', None)
17-}
18-
19 # The suffix of source filenames.
20 source_suffix = '.rst'
21

Subscribers

People subscribed via source and target branches