Meter status support in metrics collector wire format.
Ignore conflict error when releasing maas nodes
Remove obsolete comment
Move types out to a third part to break the dependency cycle
state: more type shuffling
state: move moving things around
gb ./... passes
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.
tests pass
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
Change signature of Environ.ListNetworks
Actions :: Add Completion time to ActionResults
Add tests for Completed() time, and while I'm at it, Enqueued() time too
Improvement suggestion from Domas
Remove old part of comment
Merge pull request #1104 from voidspace/listnetworks-change

Change signature of Environ.ListNetworks

Change Environ.ListNetworks to take an instance id, allowing (but not requiring) providers to return only networks for that instance. This will be useful for MaaS, where AllocateAddress will require the networks for the instance.
Merge pull request #1088 from johnweldon/actions-complete-time

Actions :: Add Completion time to ActionResults

Capture completion time of Action
responding to review feedback