Merge branch 'master' into gui

zone-h · May 25, 2016 · 15d1bbe · 15d1bbe
2 parents 74f5c85 + 5f1ead8
commit 15d1bbe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/boulder-fetch.sh b/tests/boulder-fetch.sh
@@ -3,7 +3,7 @@
 set -xe
 
 # Check out special branch until latest docker changes land in Boulder master.
-git clone https://github.com/letsencrypt/boulder $BOULDERPATH
+git clone -b docker-integration https://github.com/letsencrypt/boulder $BOULDERPATH
 cd $BOULDERPATH
 sed -i 's/FAKE_DNS: .*/FAKE_DNS: 172.17.42.1/' docker-compose.yml
 docker-compose up -d

diff --git a/tests/letstest/scripts/boulder_install.sh b/tests/letstest/scripts/boulder_install.sh
@@ -3,7 +3,7 @@
 # >>>> only tested on Ubuntu 14.04LTS <<<<
 
 # Check out special branch until latest docker changes land in Boulder master.
-git clone https://github.com/letsencrypt/boulder $BOULDERPATH
+git clone -b docker-integration https://github.com/letsencrypt/boulder $BOULDERPATH
 cd $BOULDERPATH
 sed -i 's/FAKE_DNS: .*/FAKE_DNS: 172.17.42.1/' docker-compose.yml
 docker-compose up -d