Auto merge of rust-lang#41283 - frewsxcv:rollup, r=frewsxcv

[beta] Rollup of 2 pull requests - Successful merges: rust-lang#41233, rust-lang#41274 - Failed merges:
frewsxcv · Apr 13, 2017 · a260f22 · a260f22
2 parents ca3d118 + 3303f0d
commit a260f22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/ci/docker/dist-x86-linux/Dockerfile b/src/ci/docker/dist-x86-linux/Dockerfile
@@ -6,7 +6,7 @@ WORKDIR /build
 # to http://vault.centos.org/
 RUN sed -i 's/enabled=1/enabled=0/' /etc/yum/pluginconf.d/fastestmirror.conf
 RUN sed -i 's/mirrorlist/#mirrorlist/' /etc/yum.repos.d/*.repo
-RUN sed -i 's/#\(baseurl.*\)mirror.centos.org/\1107.158.252.35/' /etc/yum.repos.d/*.repo
+RUN sed -i 's|#\(baseurl.*\)mirror.centos.org/centos/$releasever|\1vault.centos.org/5.11|' /etc/yum.repos.d/*.repo
 
 RUN yum upgrade -y && yum install -y \
       curl \

diff --git a/src/compiler-rt b/src/compiler-rt