Skip to content

7.1.x TS-5107: Changes to autolinking in Docutils 0.13#1378

Merged
zwoop merged 5 commits intoapache:7.1.xfrom
jablko:7.1.x
Jan 26, 2017
Merged

7.1.x TS-5107: Changes to autolinking in Docutils 0.13#1378
zwoop merged 5 commits intoapache:7.1.xfrom
jablko:7.1.x

Conversation

@jablko
Copy link
Copy Markdown
Contributor

@jablko jablko commented Jan 25, 2017

No description provided.

jablko added 4 commits January 25, 2017 16:43
@jablko
Revert "Fix nested role (not supported)"
e4aa6af 
This reverts commit 9e37494.

(cherry picked from commit 11bfc4b)
@jablko
Revert "Fix documentation build for docutils 0.13.1 (2/2)"
5523270 
This reverts commit f3e37f8.

(cherry picked from commit ffc906a)
@jablko
Revert "Fix documentation build for docutils 0.13.1 (1/2)"
5cdadb5 
This reverts commit ac0db84.

(cherry picked from commit 97723e7)
@jablko
TS-5107: Changes to autolinking in Docutils 0.13
4be1b81 
init_customizations() was added in Docutils 0.13.

(cherry picked from commit 111e7f5)
@atsci
Copy link
Copy Markdown

atsci commented Jan 26, 2017

FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/1396/ for details.

@zwoop
Copy link
Copy Markdown
Contributor

zwoop commented Jan 26, 2017 •
edited
Loading

Why are there 4 commits on this? Can you squash those? Or do we actually need these reverts as well?

@atsci
Copy link
Copy Markdown

atsci commented Jan 26, 2017

Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/1290/ for details.

@zwoop
Copy link
Copy Markdown
Contributor

zwoop commented Jan 26, 2017

Also, please remember to add Milestone, Label's etc. on each Issue / PR, otherwise @bryancall gets all pissy. :)

@zwoop zwoop self-requested a review January 26, 2017 00:22
@zwoop zwoop added Backport Marked for backport for an LTS patch release Documentation labels Jan 26, 2017
@zwoop zwoop added this to the 7.1.0 milestone Jan 26, 2017
@jablko
TS-5107: init_customizations() isn't new in Docutils 0.13
b903e36 
We can use it in 0.12 and 0.13.

(cherry picked from commit 977aa2c)
@atsci
Copy link
Copy Markdown

atsci commented Jan 26, 2017

FreeBSD build successful! See https://ci.trafficserver.apache.org/job/Github-FreeBSD/1398/ for details.

@atsci
Copy link
Copy Markdown

atsci commented Jan 26, 2017

Linux build successful! See https://ci.trafficserver.apache.org/job/Github-Linux/1292/ for details.

@jablko
Copy link
Copy Markdown
Contributor Author

jablko commented Jan 26, 2017

Also, please remember to add Milestone, Label's etc. on each Issue / PR, otherwise @bryancall gets all pissy. :)

Will do! :-)

Why are there 4 commits on this? Can you squash those? Or do we actually need these reverts as well?

Make that 5 ... I just added #1377 to this PR because this is broken without it. Whoops.

I think we need the reverts, this doesn't apply without them, and I think it makes most sense to maintain the parallel between the commits we're backporting and master -- so apply them as individual commits. That said, I'm happy to do it differently! I'm happy to squash any combination of them.

@zwoop
Copy link
Copy Markdown
Contributor

zwoop commented Jan 26, 2017

I saw what happened, the reverts makes sense now.

@zwoop zwoop merged commit 3c70cfc into apache:7.1.x Jan 26, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@zwoop zwoop zwoop approved these changes

Assignees

@jablko jablko

Labels

Backport Marked for backport for an LTS patch release Documentation

Projects

None yet

Milestone

7.1.0

Development

Successfully merging this pull request may close these issues.

3 participants

@jablko @atsci @zwoop