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.

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

Switch to our own websocket fork #15798

Merged
merged 2 commits into from Mar 2, 2017
Merged

Switch to our own websocket fork #15798

merged 2 commits into from Mar 2, 2017

Conversation

nox
Copy link
Contributor

@nox nox commented Mar 2, 2017 •
edited by larsbergstrom

This change is Reviewable

@highfive
Copy link

highfive commented Mar 2, 2017

Heads up! This PR modifies the following files:

  • @fitzgen: components/script/Cargo.toml
  • @KiChjang: components/net/Cargo.toml, components/script/Cargo.toml, components/net_traits/Cargo.toml, components/net_traits/Cargo.toml

@highfive highfive added the S-awaiting-review There is new code that needs to be reviewed. label Mar 2, 2017
@highfive
Copy link

highfive commented Mar 2, 2017

warning Warning warning

  • These commits modify net and script code, but no tests are modified. Please consider adding a test!

@nox
Copy link
Contributor Author

nox commented Mar 2, 2017

@bors-servo p=17

@nox nox mentioned this pull request Mar 2, 2017
Closed
@Ms2ger
Copy link
Contributor

Ms2ger commented Mar 2, 2017

r=me iff taking an Apache2.0-only dep (bitreader) is okay

@SimonSapin
Copy link
Member

@nox for posterity, can you write here why we’re forking?

@nox
Copy link
Contributor Author

nox commented Mar 2, 2017

Maintainer is AWOL and it needs a hyper bump.

@nox
Copy link
Contributor Author

nox commented Mar 2, 2017

I removed the audio-video-metadata bump that brings the Apache-2.0-only dependency.

@bors-servo r=Ms2ger

@bors-servo
Copy link
Contributor

📌 Commit da45177 has been approved by Ms2ger

@highfive highfive assigned Ms2ger and unassigned glennw Mar 2, 2017
@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-awaiting-review There is new code that needs to be reviewed. labels Mar 2, 2017
bors-servo pushed a commit that referenced this pull request Mar 2, 2017
Auto merge of #15798 - nox:websocket, r=Ms2ger
dabbdaf 
Switch to our own websocket fork

<!-- 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/15798)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

⌛ Testing commit da45177 with merge dabbdaf...

@bors-servo
Copy link
Contributor

☀️ 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
Approved by: Ms2ger
Pushing dabbdaf to master...

@bors-servo bors-servo merged commit da45177 into servo:master Mar 2, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Mar 2, 2017
@bors-servo bors-servo mentioned this pull request Mar 2, 2017
Closed
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Ms2ger Ms2ger

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@nox @highfive @Ms2ger @SimonSapin @bors-servo @glennw