Viewing all changes in revision 1983.

Committer: Tarmac
Author(s): William Reade
Date: 2013-11-13 16:52:25 UTC
mfrom: <a title="Merged From 1982.1.1" href="/~rogpeppe/juju-core/470-1.16-wallyworld-provisioner-safe-mode/revision/1982.1.1">(1982.1.1 juju-core)
Revision ID: tarmac-20131113165225-ot9urxzjtbs1c5dh

[r=fwereade],[bug=1233457] cherrypick r2042 from trunk

fixes lp:1233457

https://codereview.appspot.com/25920043/

added added

removed removed