Skip to content

Don't break the build so fast for older rust versions.#474

Merged
bors-servo merged 1 commit into
rust-lang:masterfrom
emilio:buildfix
Feb 4, 2017
Merged

Don't break the build so fast for older rust versions.#474
bors-servo merged 1 commit into
rust-lang:masterfrom
emilio:buildfix

Conversation

@emilio

@emilio emilio commented Feb 3, 2017

Copy link
Copy Markdown
Contributor

No description provided.

@emilio

emilio commented Feb 3, 2017

Copy link
Copy Markdown
Contributor Author

@bors-servo r=fitzgen

@bors-servo

Copy link
Copy Markdown

📌 Commit 514846d has been approved by fitzgen

@emilio

emilio commented Feb 3, 2017

Copy link
Copy Markdown
Contributor Author

@bors-servo p=1

@bors-servo

Copy link
Copy Markdown

🔒 Merge conflict

@bors-servo

Copy link
Copy Markdown

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

@emilio

emilio commented Feb 3, 2017

Copy link
Copy Markdown
Contributor Author

@bors-servo r=fitzgen

@bors-servo

Copy link
Copy Markdown

📌 Commit 9d59862 has been approved by fitzgen

@fitzgen

fitzgen commented Feb 4, 2017

Copy link
Copy Markdown
Member

@emilio, you didn't update the Cargo.lock file, so Travis CI failed on the diff check.

@bors-servo

Copy link
Copy Markdown

⌛ Testing commit 9d59862 with merge 3c41364...

bors-servo pushed a commit that referenced this pull request Feb 4, 2017
Don't break the build so fast for older rust versions.
@bors-servo

Copy link
Copy Markdown

💔 Test failed - status-travis

@emilio

emilio commented Feb 4, 2017

Copy link
Copy Markdown
Contributor Author

@bors-servo r=fitzgen

@bors-servo

Copy link
Copy Markdown

📌 Commit 1228df6 has been approved by fitzgen

@bors-servo

Copy link
Copy Markdown

⌛ Testing commit 1228df6 with merge 1f130c1...

bors-servo pushed a commit that referenced this pull request Feb 4, 2017
Don't break the build so fast for older rust versions.
@bors-servo

Copy link
Copy Markdown

☀️ Test successful - status-travis
Approved by: fitzgen
Pushing 1f130c1 to master...

@bors-servo bors-servo merged commit 1228df6 into rust-lang:master Feb 4, 2017
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.

4 participants