Meter status support in metrics collector wire format.
Ignore conflict error when releasing maas nodes
Remove obsolete comment
Tweaked upgrade target selection

upgrades.PerformUpgrade() now takes all the upgrade targets for the
machine being upgraded instead of being called once per upgrade
target. This removes the possibility of upgrade steps being run twice,
simplifies the upgrade-steps worker and also ensures upgrade steps are
run in a more readily understood order.
Remove special casing for the databaseMaster upgrade target

Nows that upgrades.PerformUpgrade() is called once with all targets
for the machine being upgraded there is no need to treat
databaseMaster as a special case. The master state server now gets
two upgrade targets: stateServer and databaseMaster. This simplifies
the code and tests.
Merge pull request #1097 from mjs/upgrade-target-selection

Tweaked target selection

Tweaked upgrade target selection

upgrades.PerformUpgrade() now takes all the upgrade targets for the machine being upgraded instead of being called once per upgrade target. This removes the possibility of upgrade steps being run twice, simplifies the upgrade-steps worker and also ensures upgrade steps are run in a more readily understood order.

---

Remove special casing for the databaseMaster upgrade target

Nows that upgrades.PerformUpgrade() is called once with all targets for the machine being upgraded there is no need to treat databaseMaster as a special case. The master state server now gets two upgrade targets: stateServer and databaseMaster. This simplifies the code and tests.
Refactor InstanceBroker.StartInstance to return result struct

StartInstance will soon need to grow another result for
reporting back block devices allocated to a provisioned
instance. Rather than having to touch every bit of code
each time we expand the set, use a result struct.
Merge pull request #1100 from axw/environs-startinstanceresult

Refactor InstanceBroker.StartInstance to return result struct

StartInstance will soon need to grow another result for
reporting back block devices allocated to a provisioned
instance. Rather than having to touch every bit of code
each time we expand the set, use a result struct.
Comment update
Merge pull request #1095 from voidspace/maas-1381619

Ignore conflict error when releasing maas nodes

When releasing a node that is not in a releasable status, i.e. typically is already released, maas returns an error 409. Instead of dying and refusing to destroy environment we now ignore that error.

Error 409 is only used for a limited set of statuses, so this seems like safe behaviour. See: https://bugs.launchpad.net/maas/+bug/1381619/comments/15

Fixes bug 1381619.
Merge pull request #1076 from tasdomas/wire_format_unit_status

Meter status support in metrics collector wire format.

Meter status updating support in wire format for sending metrics to the metrics collector.
Merge branch 'master' of https://github.com/juju/juju into 210-apiserver-state-refactor

Conflicts:
	cmd/jujud/machine_test.go
	cmd/jujud/upgrade.go
	cmd/jujud/upgrade_test.go