From fe3c3be675f175fbb9dfed9b97f1d556253d0014 Mon Sep 17 00:00:00 2001
From: Jakub Warmuz <jakub@warmuz.org>
Date: Sat, 18 Jul 2015 19:25:30 +0000
Subject: [PATCH 1/2] Travis: run Boulder in AMQP mode (fixes #620).

---
 .travis.yml            | 5 ++++-
 tests/boulder-start.sh | 9 +++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7cccd20c9..52ad49506 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,8 @@
 language: python
 
+services:
+  - rabbitmq
+
 # http://docs.travis-ci.com/user/ci-environment/#CI-environment-OS
 before_install:
   - travis_retry sudo ./bootstrap/ubuntu.sh
@@ -20,7 +23,7 @@ env:
     - TOXENV=cover
 
 install: "travis_retry pip install tox coveralls"
-before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh'
+before_script: '[ "xxx$BOULDER_INTEGRATION" = "xxx" ] || ./tests/boulder-start.sh amqp'
 script: 'travis_retry tox && ([ "xxx$BOULDER_INTEGRATION" = "xxx" ] || (source .tox/$TOXENV/bin/activate && ./tests/boulder-integration.sh))'
 
 after_success: '[ "$TOXENV" == "cover" ] && coveralls'
diff --git a/tests/boulder-start.sh b/tests/boulder-start.sh
index 49139ff3c..20f64bcce 100755
--- a/tests/boulder-start.sh
+++ b/tests/boulder-start.sh
@@ -11,5 +11,10 @@ export GOPATH="${GOPATH:-/tmp/go}"
 go get -d github.com/letsencrypt/boulder/cmd/boulder
 cd $GOPATH/src/github.com/letsencrypt/boulder
 make -j4  # Travis has 2 cores per build instance.
-./start.sh &
-# Hopefully start.sh bootstraps before integration test is started...
+if [ "$1" = "amqp" ];
+then
+    ./start.py &
+else
+    ./start.sh &
+fi
+# Hopefully start.py/start.sh bootstraps before integration test is started...

From 7908ea0b868f159aace798c67f6e5987dfef1e78 Mon Sep 17 00:00:00 2001
From: Peter Mosmans <support@go-forward.net>
Date: Mon, 20 Jul 2015 10:17:58 +0200
Subject: [PATCH 2/2] Fixed typo

Changed config-changes in the short help (wrong) to config_changes (right)
---
 letsencrypt/cli.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/letsencrypt/cli.py b/letsencrypt/cli.py
index 0797f23b4..6692d9c99 100644
--- a/letsencrypt/cli.py
+++ b/letsencrypt/cli.py
@@ -57,7 +57,7 @@ USAGE = SHORT_USAGE + """Major SUBCOMMANDS are:
   install              Install a previously obtained cert in a server
   revoke               Revoke a previously obtained certificate
   rollback             Rollback server configuration changes made during install
-  config-changes       Show changes made to server config during installation
+  config_changes       Show changes made to server config during installation
 
 Choice of server for authentication/installation: