Skip to content

reference: miscellaneous fixes #26796

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
Merged
merged 1 commit into from
Jul 17, 2015
Merged

reference: miscellaneous fixes #26796

merged 1 commit into from
Jul 17, 2015

Conversation

tshepang
Copy link
Member

@tshepang tshepang commented Jul 5, 2015

No description provided.

@rust-highfive
Copy link
Contributor

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@steveklabnik
Copy link
Contributor

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 5, 2015

📌 Commit 52a992d has been approved by steveklabnik

@steveklabnik steveklabnik mentioned this pull request Jul 5, 2015
Merged
bors added a commit that referenced this pull request Jul 5, 2015
@bors
Auto merge of #26798 - steveklabnik:rollup, r=steveklabnik
281cfb9 
- Successful merges: #26785, #26787, #26788, #26791, #26792, #26795
- Failed merges: #26796
@bors
Copy link
Collaborator

bors commented Jul 5, 2015

☔ The latest upstream changes (presumably #26798) made this pull request unmergeable. Please resolve the merge conflicts.

@steveklabnik steveklabnik mentioned this pull request Jul 5, 2015
Merged
bors added a commit that referenced this pull request Jul 5, 2015
@bors
Auto merge of #26811 - steveklabnik:rollup, r=steveklabnik
d0fdfbf 
- Successful merges: #26464, #26789, #26800, #26806, #26808
- Failed merges: #26796
@bors
Copy link
Collaborator

bors commented Jul 6, 2015

🔒 Merge conflict

This was referenced Jul 6, 2015
Closed
Closed
Merged
bors added a commit that referenced this pull request Jul 7, 2015
@bors
Auto merge of #26844 - steveklabnik:rollup, r=steveklabnik
26f0cd5 
- Successful merges: #26599, #26761, #26807, #26809, #26825, #26827, #26828, #26832, #26834, #26835
- Failed merges: #26796
@steveklabnik steveklabnik mentioned this pull request Jul 7, 2015
Merged
bors added a commit that referenced this pull request Jul 7, 2015
@bors
Auto merge of #26861 - steveklabnik:rollup, r=steveklabnik
e6a9be1 
- Successful merges: #26742, #26852, #26853, #26854, #26855, #26857
- Failed merges: #26796
@tshepang
Copy link
Member Author

tshepang commented Jul 7, 2015

conflict fixed

@steveklabnik
Copy link
Contributor

@bors: r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 16, 2015

📌 Commit 4ee7047 has been approved by steveklabnik

@bors bors merged commit 4ee7047 into rust-lang:master Jul 17, 2015
@tshepang tshepang deleted the more-ref-fixes branch July 17, 2015 19:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@brson brson

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@tshepang @rust-highfive @steveklabnik @bors @brson