Merge master for your feature branches

[Cheryl Jennings]

Hi everyone,

The admin-controller-model branch which merged into master yesterday
brought the new behavior of two models being created upon bootstrap -
"admin" and "default".  Significant changes were needed in CI to support
this new behavior.

You will need to merge master into your feature branches to pick up this
change, or CI will not pass on your branch.

Please let me know if you have any questions.

Thanks!
-Cheryl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/juju-dev/attachments/20160324/8a737933/attachment.html>