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

Update RLS submodule #42911

Merged
merged 1 commit into from
Jul 1, 2017
Merged

Update RLS submodule #42911

merged 1 commit into from
Jul 1, 2017

Conversation

nrc
Copy link
Member

@nrc nrc commented Jun 26, 2017

No description provided.

@rust-highfive
Copy link
Collaborator

r? @brson

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

@brson
Copy link
Contributor

brson commented Jun 26, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Jun 26, 2017

📌 Commit 41a1e39 has been approved by brson

@sophiajt sophiajt mentioned this pull request Jun 26, 2017
Closed
@nrc
Copy link
Member Author

nrc commented Jun 26, 2017

@bors: r-

@nrc
Copy link
Member Author

nrc commented Jun 26, 2017

hmm, nested workspaces :-(

@ishitatsuyuki ishitatsuyuki mentioned this pull request Jun 27, 2017
Closed
@emk
Copy link
Contributor

emk commented Jun 27, 2017

Looks like it's failing with a conflict on Cargo.lock.

@nrc
Copy link
Member Author

nrc commented Jun 27, 2017

@bors: r=brson

@bors
Copy link
Contributor

bors commented Jun 27, 2017

📌 Commit 3dad197 has been approved by brson

@arielb1 arielb1 added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 27, 2017
@frewsxcv
Copy link
Member

@bors rollup

frewsxcv added a commit to frewsxcv/rust that referenced this pull request Jun 29, 2017
@frewsxcv
Rollup merge of rust-lang#42911 - nrc:rls-update, r=brson
8d4bce3 
Update RLS submodule
@frewsxcv frewsxcv mentioned this pull request Jun 29, 2017
Closed
frewsxcv added a commit to frewsxcv/rust that referenced this pull request Jun 30, 2017
@frewsxcv
Rollup merge of rust-lang#42911 - nrc:rls-update, r=brson
7e22875 
Update RLS submodule
@frewsxcv frewsxcv mentioned this pull request Jun 30, 2017
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 30, 2017
@GuillaumeGomez
Rollup merge of rust-lang#42911 - nrc:rls-update, r=brson
bb773b9 
Update RLS submodule
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 30, 2017
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 30, 2017
@GuillaumeGomez
Rollup merge of rust-lang#42911 - nrc:rls-update, r=brson
3502801 
Update RLS submodule
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 30, 2017
Closed
GuillaumeGomez added a commit to GuillaumeGomez/rust that referenced this pull request Jun 30, 2017
@GuillaumeGomez
Rollup merge of rust-lang#42911 - nrc:rls-update, r=brson
ed04f56 
Update RLS submodule
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jun 30, 2017
Merged
bors added a commit that referenced this pull request Jun 30, 2017
@bors
Auto merge of #42995 - GuillaumeGomez:rollup, r=GuillaumeGomez
7d89b20 
Rollup of 6 pull requests

- Successful merges: #42669, #42911, #42925, #42957, #42985, #42987
- Failed merges: #42936
@bors bors merged commit 3dad197 into rust-lang:master Jul 1, 2017
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
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@nrc @rust-highfive @brson @bors @emk @frewsxcv @arielb1