revert only r943

revert only r943

William merged a change which reverted trunk back to 942
because rev 943 broke the test suite.

This just re-introduces all of the merges 944-947, so that
Gustavo and Ian don't have to re-propose and get approval
for their changes again.

I've run the test suite to make sure it passes as long as
just 943 has been removed.

In the future, you can just cherrypick-out specific revisions
with (eg):
 bzr merge . -r 943..942

And then run the test suite, and propose it. (Which is essentially
what this patch does, except it also reverts 948 which removed
all of those other revisions.)

https://code.launchpad.net/~jameinel/juju-core/only-943/+merge/151005

(do not edit description out of merge proposal)

[jameinel, 2013-02-28 12:31:04]

Please take a look.

[wallyworld, 2013-02-28 12:55:26]

LGTM. Thanks for doing this.

[fwereade, 2013-02-28 13:05:14]

LGTM -- thank you very much.

[jameinel, 2013-02-28 13:09:03]

*** Submitted:

revert only r943

William merged a change which reverted trunk back to 942
because rev 943 broke the test suite.

This just re-introduces all of the merges 944-947, so that
Gustavo and Ian don't have to re-propose and get approval
for their changes again.

I've run the test suite to make sure it passes as long as
just 943 has been removed.

In the future, you can just cherrypick-out specific revisions
with (eg):
 bzr merge . -r 943..942

And then run the test suite, and propose it. (Which is essentially
what this patch does, except it also reverts 948 which removed
all of those other revisions.)

R=wallyworld, fwereade
CC=
https://codereview.appspot.com/7424046