Merge branch 'travis' into rollup

Conflicts: .travis.yml
2014-10-02 15:45:16 -07:00 · 2014-10-02 15:45:16 -07:00 · d911936dbd
commit d911936dbd
parent f96ee10e88 9ac804ecab
2 changed files with 8 additions and 0 deletions
--- a/src/test/run-pass/unix-process-spawn-errno.rs
+++ b/src/test/run-pass/unix-process-spawn-errno.rs
@ -9,6 +9,7 @@
 // except according to those terms.

 // ignore-windows
+// ignore-macos

 #![feature(macro_rules)]