initial commit
Remove silly wait
added tool
Added some tests
Merge branch 'reboot-tool' into staging
stage 1
gofmt
responded to feedback
Fix bug in upgrade test

oldID is converted to a string. Which is different to the the bytes
version stored in the document.
Merge branch 'master' of https://github.com/juju/juju into fix-upgrade-bug
State Upgrade steps: Add EnvUUID to settings and settingsRefs

Add two upgrade steps which prepend the environ uuid to the _id field
of the settings and settingsRefs collection. Refactor TestChange in
megawatcher_internal_test.go to allow test cases to be configured with
a state instance (the refactor also removes about 100 lines of code).
Refactor state/upgrades_test.go to support collection specific
overriding of the generic checkAddEnvUUIDToCollection and
checkAddEnvUUIDToCollectionIdempotent.
juju status: fixes lp:1361316
handle when apiclient.Status() returns a nil api.Status pointer
Merge pull request #1080 from wwitzel3/ww3-lp-1361316

juju status: fixes lp:1361316

handle when apiclient.Status() returns a nil api.Status pointer

Bug: https://bugs.launchpad.net/juju-core/+bug/1361316
Review: http://reviews.vapour.ws/r/382/
Merge pull request #1086 from gabriel-samfira/staging

reboot uniter and tool

This PR is a combination of:

https://github.com/juju/juju/pull/831
https://github.com/juju/juju/pull/832
Actions :: Ensure the action watcher returns the id's in the order they were enqueued
Address feedback, fixup tests
Merge pull request #1006 from johnweldon/actions-watcher-ordered-fix

Actions :: Ensure the action watcher returns the id's in the order they ...

...were enqueued
Merge branch 'master' of https://github.com/juju/juju into migrate-settings

Conflicts:
	state/upgrades_test.go
	upgrades/steps121.go
Merge branch 'master' of https://github.com/juju/juju into migrate-settings
Merge pull request #1065 from waigani/migrate-settings

State Upgrade steps: Add EnvUUID to settings and settingsRefs

Add two upgrade steps which prepend the environ uuid to the _id field
of the settings and settingsRefs collection. Refactor TestChange in
megawatcher_internal_test.go to allow test cases to be configured with
a state instance (the refactor also removes about 100 lines of code).
Refactor state/upgrades_test.go to support collection specific
overriding of the generic checkAddEnvUUIDToCollection and
checkAddEnvUUIDToCollectionIdempotent.