Skip to content

/ servo

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 jpeg-decoder to 0.1.10 and disallow duplicate rayon versions again #14708

Merged
merged 1 commit into from Dec 24, 2016
Merged

Update jpeg-decoder to 0.1.10 and disallow duplicate rayon versions again #14708

merged 1 commit into from Dec 24, 2016
+5 −17

Conversation

@kaksmet
Copy link
Contributor

kaksmet commented Dec 23, 2016 •
edited by larsbergstrom

This change is Reviewable
@SimonSapin
Copy link
Member

SimonSapin commented Dec 23, 2016

Thanks!

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

bors-servo commented Dec 23, 2016

📌 Commit 58e17a1 has been approved by SimonSapin
@highfive highfive assigned SimonSapin and unassigned metajack Dec 23, 2016
@nox nox mentioned this pull request Dec 23, 2016
Closed
@bors-servo
Copy link
Contributor

bors-servo commented Dec 24, 2016

☔ The latest upstream changes (presumably #14687) made this pull request unmergeable. Please resolve the merge conflicts.
@kaksmet
Update jpeg-decoder to 0.1.10 and disallow duplicate rayon versions a…
Loading status checks…
d0df928 
…gain
@kaksmet kaksmet force-pushed the kaksmet:update-jpeg-decoder branch from 58e17a1 to d0df928 Dec 24, 2016
@kaksmet
Copy link
Contributor Author

kaksmet commented Dec 24, 2016

Rebased
@jdm
Copy link
Member

jdm commented Dec 24, 2016

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

bors-servo commented Dec 24, 2016

📌 Commit d0df928 has been approved by jdm
@highfive highfive assigned jdm and unassigned SimonSapin Dec 24, 2016
@bors-servo
Copy link
Contributor

bors-servo commented Dec 24, 2016

⌛ Testing commit d0df928 with merge c252652...
bors-servo added a commit that referenced this pull request Dec 24, 2016
@bors-servo
Auto merge of #14708 - kaksmet:update-jpeg-decoder, r=jdm
Loading status checks…
c252652 
Update jpeg-decoder to 0.1.10 and disallow duplicate rayon versions again

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

bors-servo commented Dec 24, 2016

☀️ Test successful - android, arm32, arm64, linux-dev, linux-rel-css, linux-rel-wpt, mac-dev-unit, mac-rel-css, mac-rel-wpt1, mac-rel-wpt2, windows-gnu-dev, windows-msvc-dev
@bors-servo bors-servo merged commit d0df928 into servo:master Dec 24, 2016
2 of 3 checks passed
2 of 3 checks passed
continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details
@kaksmet kaksmet deleted the kaksmet:update-jpeg-decoder branch Dec 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jdm jdm

Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@kaksmet @SimonSapin @bors-servo @jdm @metajack @highfive
You can’t perform that action at this time.