Skip to content

Revert "Auto merge of #15136 - nox:mitochondria-finally-makes-it-into…#15176

Merged
bors-servo merged 1 commit intoservo:masterfrom
nox:the-sadness
Jan 24, 2017
Merged

Revert "Auto merge of #15136 - nox:mitochondria-finally-makes-it-into…#15176
bors-servo merged 1 commit intoservo:masterfrom
nox:the-sadness

Conversation

@nox
Copy link
Copy Markdown
Contributor

@nox nox commented Jan 24, 2017 •
edited by larsbergstrom
Loading

This change is Reviewable

@nox
Revert "Auto merge of servo#15136 - nox:mitochondria-finally-makes-it…
f1738ee 
…-into-the-tree, r=jdm"

This reverts commit ca6376a, reversing
changes made to bb24fd3.
@highfive
Copy link
Copy Markdown

highfive commented Jan 24, 2017

Heads up! This PR modifies the following files:

  • @fitzgen: components/script/script_thread.rs, components/script/Cargo.toml, components/script/lib.rs
  • @KiChjang: components/script/script_thread.rs, components/script/Cargo.toml, components/script/lib.rs

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

highfive commented Jan 24, 2017

warning Warning warning

  • These commits modify unsafe code. Please review it carefully!
  • These commits modify script code, but no tests are modified. Please consider adding a test!

@Ms2ger
Copy link
Copy Markdown
Contributor

Ms2ger commented Jan 24, 2017

@bors-servo r+ p=2

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jan 24, 2017

📌 Commit f1738ee has been approved by Ms2ger

@highfive highfive assigned Ms2ger and unassigned KiChjang Jan 24, 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 Jan 24, 2017
@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jan 24, 2017

⌛ Testing commit f1738ee with merge af9e22a...

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jan 24, 2017

💔 Test failed - windows-gnu-dev

@highfive highfive added S-tests-failed The changes caused existing tests to fail. and removed S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. labels Jan 24, 2017
@Ms2ger
Copy link
Copy Markdown
Contributor

Ms2ger commented Jan 24, 2017

@bors-servo retry p=1001

@bors-servo
Copy link
Copy Markdown
Contributor

bors-servo commented Jan 24, 2017

⌛ Testing commit f1738ee with merge 8382aaa...

@highfive highfive added S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. and removed S-tests-failed The changes caused existing tests to fail. labels Jan 24, 2017
bors-servo pushed a commit that referenced this pull request Jan 24, 2017
Auto merge of #15176 - nox:the-sadness, r=Ms2ger
8382aaa 
Revert "Auto merge of #15136 - nox:mitochondria-finally-makes-it-into…

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

bors-servo commented Jan 24, 2017

☀️ 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 f1738ee into servo:master Jan 24, 2017
@highfive highfive removed the S-awaiting-merge The PR is in the process of compiling and running tests on the automated CI. label Jan 24, 2017
@bors-servo bors-servo mentioned this pull request Jan 24, 2017
Merged
4 tasks
This was referenced Jan 24, 2017
Merged
Closed
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.

5 participants

@nox @highfive @Ms2ger @bors-servo @KiChjang