Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ed9108d

Browse files
committedMar 25, 2017
Auto merge of #40810 - alexcrichton:rollup, r=alexcrichton
Rollup of 11 pull requests - Successful merges: #40347, #40501, #40516, #40524, #40540, #40642, #40683, #40764, #40778, #40807, #40809 - Failed merges: #40771
2 parents 49c67bd + 9dc591c commit ed9108d

File tree

111 files changed

+844
-1710
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+844
-1710
lines changed
 

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ matrix:
5252
os: osx
5353
osx_image: xcode8.2
5454
install: &osx_install_sccache >
55-
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-apple-darwin &&
55+
travis_retry curl -o /usr/local/bin/sccache https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-apple-darwin &&
5656
chmod +x /usr/local/bin/sccache &&
5757
travis_retry curl -o /usr/local/bin/stamp https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-17-stamp-x86_64-apple-darwin &&
5858
chmod +x /usr/local/bin/stamp

‎appveyor.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ install:
115115
- set PATH=C:\Python27;%PATH%
116116

117117
# Download and install sccache
118-
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-22-sccache-x86_64-pc-windows-msvc
119-
- mv 2017-03-22-sccache-x86_64-pc-windows-msvc sccache.exe
118+
- appveyor-retry appveyor DownloadFile https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror/2017-03-24-sccache-x86_64-pc-windows-msvc
119+
- mv 2017-03-24-sccache-x86_64-pc-windows-msvc sccache.exe
120120
- set PATH=%PATH%;%CD%
121121

122122
# Download and install ninja

0 commit comments

Comments
 (0)
Please sign in to comment.