diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-26 16:30:19 -0500 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-05-26 16:30:19 -0500 |
| commit | db7f8b38fc4e7f0c1b197d95b70b6bd05bea3a1f (patch) | |
| tree | c967971e85f8cd5de439a9a20c915ab8877ee12e /components/script/script_thread.rs | |
| parent | 6d0c420d59b3e24ce6818bedaad5f6fdf9b74966 (diff) | |
| parent | 5317ae14e2da2b68db914a76eede60b559070a13 (diff) | |
| download | servo-db7f8b38fc4e7f0c1b197d95b70b6bd05bea3a1f.tar.gz servo-db7f8b38fc4e7f0c1b197d95b70b6bd05bea3a1f.zip | |
Auto merge of #11447 - servo:jdm-patch-3, r=metajack
Disable redirect-origin.html on OS X
Disable a test that started permanently timing out in #11429.
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).
<!-- Either: -->
- [ ] There are tests for these changes OR
- [X] These changes do not require tests because disabling a test
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11447)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/script_thread.rs')
0 files changed, 0 insertions, 0 deletions