Skip to content

/ euclid

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

Update serde to 1.0 and bump version #196

Merged
merged 2 commits into from Jun 14, 2017
Merged

Update serde to 1.0 and bump version #196

merged 2 commits into from Jun 14, 2017

Conversation

@Eijebong
Copy link
Member

Eijebong commented May 23, 2017 •
edited by larsbergstrom

This change is Reviewable
@kvark
kvark approved these changes May 23, 2017
View changes
@kvark
Copy link
Member

kvark commented May 23, 2017

Not sure if/when we can merge this, considering servo/webrender#1281 (comment)
@Eijebong
Copy link
Member Author

Eijebong commented May 23, 2017

(Yeah, working on this right now ^^), since I changed the version, does it really matter though ?)
@kvark
Copy link
Member

kvark commented May 23, 2017

since I changed the version, does it really matter though ?

it would essentially block any other updates we may potentially need for Servo/WR until serde 1.0 is fully adopted
@Eijebong Eijebong mentioned this pull request May 23, 2017
Closed
@bors-servo
Copy link
Contributor

bors-servo commented Jun 5, 2017

☔ The latest upstream changes (presumably #207) made this pull request unmergeable. Please resolve the merge conflicts.
@Eijebong Eijebong force-pushed the Eijebong:serde1.0 branch from bd96609 to 8fad39d Jun 10, 2017
@Eijebong
Bump serde to 1.0
6c3bebb
@Eijebong Eijebong force-pushed the Eijebong:serde1.0 branch from 8fad39d to 665cf9c Jun 14, 2017
@Eijebong
Bump version
Loading status checks…
58f0e8b
@Eijebong Eijebong force-pushed the Eijebong:serde1.0 branch 2 times, most recently from 0e57a0a to 58f0e8b Jun 14, 2017
@emilio
Copy link
Member

emilio commented Jun 14, 2017

@bors-servo r+
@bors-servo
Copy link
Contributor

bors-servo commented Jun 14, 2017

📌 Commit 58f0e8b has been approved by emilio
@bors-servo
Copy link
Contributor

bors-servo commented Jun 14, 2017

⌛ Testing commit 58f0e8b with merge a2598fa...
bors-servo added a commit that referenced this pull request Jun 14, 2017
@bors-servo
Auto merge of #196 - Eijebong:serde1.0, r=emilio
Loading status checks…
a2598fa 
Update serde to 1.0 and bump version

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/euclid/196)
<!-- Reviewable:end -->
@emilio
Copy link
Member

emilio commented Jun 14, 2017

@bors-servo r=kvark,emilio
@bors-servo
Copy link
Contributor

bors-servo commented Jun 14, 2017

💡 This pull request was already approved, no need to approve it again.

  • This pull request is currently being tested. If there's no response from the continuous integration service, you may use retry to trigger a build again.
@bors-servo
Copy link
Contributor

bors-servo commented Jun 14, 2017

📌 Commit 58f0e8b has been approved by kvark,emilio
@bors-servo
Copy link
Contributor

bors-servo commented Jun 14, 2017

⌛ Testing commit 58f0e8b with merge c3e773a...
bors-servo added a commit that referenced this pull request Jun 14, 2017
@bors-servo
Auto merge of #196 - Eijebong:serde1.0, r=kvark,emilio
Loading status checks…
c3e773a 
Update serde to 1.0 and bump version

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/euclid/196)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented Jun 14, 2017

☀️ Test successful - status-travis
Approved by: kvark,emilio
Pushing c3e773a to master...
@bors-servo bors-servo merged commit 58f0e8b into servo:master Jun 14, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
@bors-servo bors-servo mentioned this pull request Jun 14, 2017
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvark kvark

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@Eijebong @kvark @bors-servo @emilio
You can’t perform that action at this time.