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.

Sign up for GitHub

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

Jump to bottom

Fix beta branch #32894

Merged
merged 1 commit into from
Apr 15, 2016
Merged

Fix beta branch #32894

merged 1 commit into from
Apr 15, 2016

Conversation

brson
Copy link
Contributor

@brson brson commented Apr 12, 2016

This test tests a message that is only displayed on nightly.

Still testing this locally, but I suspect it's correct. r? @alexcrichton

@brson
Fix beta branch
647e73d 
This test tests a message that is only displayed on nightly.
@brson brson added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 12, 2016
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Apr 12, 2016

📌 Commit 647e73d has been approved by alexcrichton

@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Apr 12, 2016
@brson
Copy link
Contributor Author

brson commented Apr 12, 2016

Passes locally.

@brson brson mentioned this pull request Apr 12, 2016
Merged
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Apr 12, 2016
@alexcrichton
Copy link
Member

@bors: rollup

steveklabnik added a commit to steveklabnik/rust that referenced this pull request Apr 14, 2016
@steveklabnik
Rollup merge of rust-lang#32894 - brson:fixbeta, r=alexcrichton
e548880 
Fix beta branch

This test tests a message that is only displayed on nightly.

Still testing this locally, but I suspect it's correct. r? @alexcrichton
@steveklabnik steveklabnik mentioned this pull request Apr 14, 2016
Merged
@bors
Copy link
Contributor

bors commented Apr 14, 2016

⌛ Testing commit 647e73d with merge 2a1c602...

@bors
Copy link
Contributor

bors commented Apr 14, 2016

💔 Test failed - auto-win-msvc-64-opt-rustbuild

@alexcrichton
Copy link
Member

@bors: retry

On Thu, Apr 14, 2016 at 12:56 PM, bors notifications@github.com wrote:

[image: 💔] Test failed - auto-win-msvc-64-opt-rustbuild
http://buildbot.rust-lang.org/builders/auto-win-msvc-64-opt-rustbuild/builds/714

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#32894 (comment)

bors added a commit that referenced this pull request Apr 14, 2016
@bors
Auto merge of #32960 - steveklabnik:rollup, r=steveklabnik
2174bd9 
Rollup of 15 pull requests

- Successful merges: #32646, #32855, #32856, #32865, #32868, #32869, #32876, #32884, #32885, #32893, #32894, #32932, #32937, #32940, #32941
- Failed merges: #32912
@bors bors merged commit 647e73d into rust-lang:master Apr 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@brson @alexcrichton @bors