Skip to content

Conversation

@nealwu
Copy link
Contributor

@nealwu nealwu commented May 26, 2017

Merges the changes from #9954 and #9975 into master, since they were only merged into r1.1.

@nealwu nealwu requested a review from yifeif May 26, 2017 00:44
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@nealwu
Copy link
Contributor Author

nealwu commented May 26, 2017

Both commit authors have already had their work merged into r1.1 in the pull requests linked above, so that should be fine.

@nealwu nealwu added cla: yes and removed cla: no labels May 26, 2017
@nealwu nealwu requested a review from rmlarsen May 26, 2017 00:51
Copy link
Contributor

@yifeif yifeif left a comment

Choose a reason for hiding this comment

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

Thanks for merging these changes back Neal!

@nealwu
Copy link
Contributor Author

nealwu commented May 31, 2017

@andrewharp can we get this merged in?

@gunan gunan merged commit d3c0482 into master May 31, 2017
@gunan gunan deleted the release-branch-commits branch May 31, 2017 18:35
@gunan
Copy link
Contributor

gunan commented May 31, 2017

Failure is a known flaky test (should be disabled now).
Since this is a merge PR, CLA is also OK, since all CLAs are signed.
Merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants