Merge lp://qastaging/~frankban/charms/trusty/redis/keep-broken into lp://qastaging/~juju-gui/charms/trusty/redis/trunk

Reviewers: mp+262429_code.launchpad.net,

Message:
Please take a look.

Description:
Pass --keep-broken to juju bootstrap.

https://code.launchpad.net/~frankban/charms/trusty/redis/keep-broken/+merge/262429

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/247130043/

Affected files (+3, -1 lines):
   M Makefile
   A [revision details]

Index: Makefile
=== modified file 'Makefile'
--- Makefile 2015-06-16 12:50:46 +0000
+++ Makefile 2015-06-19 08:09:34 +0000
@@ -93,7 +93,7 @@

  .PHONY: ftest
  ftest: $(VENV_ACTIVATE) jenv
- @juju bootstrap -e $(JENV) --upload-tools || \
+ @juju bootstrap -e $(JENV) --keep-broken --upload-tools || \
    echo "reusing already bootstrapped $(JENV) environment"
   @ # Wait for the environment to be ready.
   @juju status -e $(JENV)

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision:
<email address hidden>

Self review: trivial.

https://codereview.appspot.com/247130043/

*** Submitted:

Pass --keep-broken to juju bootstrap.

R=
CC=
https://codereview.appspot.com/247130043

https://codereview.appspot.com/247130043/