Skip to content

Conversation

@dhermes
Copy link
Contributor

@dhermes dhermes commented May 18, 2017

This reverts commit a849060.

NOTE: This is labeled "don't merge" because the Sphinx fix hasn't been released to PyPI yet (note the change in nox.py, which is the part that shouldn't be merged).

@dhermes dhermes added docs do not merge Indicates a pull request not ready for merge, due to either quality or timing. labels May 18, 2017
@googlebot googlebot added the cla: yes This human has signed the Contributor License Agreement. label May 18, 2017
Copy link
Contributor

@tseaver tseaver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM modulo the not-to-be-merged changes to the root nox.py.

@dhermes dhermes removed the do not merge Indicates a pull request not ready for merge, due to either quality or timing. label Jun 5, 2017
@dhermes
Copy link
Contributor Author

dhermes commented Jun 5, 2017

@tseaver @lukesneeringer Sphinx==1.6.2 has been released so this is ready to merge.

@tseaver
Copy link
Contributor

tseaver commented Jun 5, 2017

Merge away when green.

@dhermes dhermes merged commit 45084cf into googleapis:master Jun 5, 2017
@dhermes dhermes deleted the revert-3422 branch June 5, 2017 19:40
landrito pushed a commit to landrito/google-cloud-python that referenced this pull request Aug 21, 2017
landrito pushed a commit to landrito/google-cloud-python that referenced this pull request Aug 22, 2017
landrito pushed a commit to landrito/google-cloud-python that referenced this pull request Aug 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

cla: yes This human has signed the Contributor License Agreement.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants