Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge backport branch back into master #5124

Merged
merged 5 commits into from
Feb 4, 2020

Conversation

flip1995
Copy link
Member

@flip1995 flip1995 commented Feb 1, 2020

Merge back backport branch rust-1.42.0 into master.

Waiting on rust-lang/rust#68753

changelog: none

@flip1995 flip1995 added the S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work label Feb 1, 2020
@JohnTitor
Copy link
Member

JohnTitor commented Feb 1, 2020

@flip1995 Just confirm: could I r+ clippy up on rust-lang/rust? Or are there any thoughts?

@flip1995
Copy link
Member Author

flip1995 commented Feb 2, 2020

I don't have rights in the rust-lang/rust repo, so not really my place to decide. But if you just clippyuped to the latest master branch, this normally gets accepted with bors r+ p=1.

Since you posted here: No commits from this PR or the rust-1.42.0 branch should be included in the clippyup.

@flip1995 flip1995 removed the S-blocked Status: marked as blocked ❌ on something else such as an RFC or other implementation work label Feb 4, 2020
@flip1995
Copy link
Member Author

flip1995 commented Feb 4, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 4, 2020

📋 Looks like this PR is still in progress, ignoring approval.

Hint: Remove [WIP] from this PR's title when it is ready for review.

@flip1995 flip1995 changed the title [WIP] Merge backport branch back into master Merge backport branch back into master Feb 4, 2020
@flip1995
Copy link
Member Author

flip1995 commented Feb 4, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Feb 4, 2020

📌 Commit 096b2b8 has been approved by flip1995

@bors
Copy link
Collaborator

bors commented Feb 4, 2020

⌛ Testing commit 096b2b8 with merge ef4eec1...

bors added a commit that referenced this pull request Feb 4, 2020
Merge backport branch back into master

Merge back backport branch rust-1.42.0 into master.

Waiting on rust-lang/rust#68753

changelog: none
@bors
Copy link
Collaborator

bors commented Feb 4, 2020

💥 Test timed out

@flip1995
Copy link
Member Author

flip1995 commented Feb 4, 2020

@bors retry

@bors
Copy link
Collaborator

bors commented Feb 4, 2020

⌛ Testing commit 096b2b8 with merge d33c603...

bors added a commit that referenced this pull request Feb 4, 2020
Merge backport branch back into master

Merge back backport branch rust-1.42.0 into master.

Waiting on rust-lang/rust#68753

changelog: none
@bors
Copy link
Collaborator

bors commented Feb 4, 2020

☀️ Test successful - checks-travis, status-appveyor
Approved by: flip1995
Pushing d33c603 to master...

@bors bors merged commit 096b2b8 into rust-lang:master Feb 4, 2020
@flip1995 flip1995 deleted the backport_back_merge branch February 4, 2020 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants