WIP
Better code for working out provider type
Merge branch 'master' of github.com:juju/juju into network-interfaces
Restore copyright header
Minor tweak
Test fixes
Test config files not written when specified
Test improvement
Minor refactoring
Adding periods to comments
provider/manual: don't change config in Open/SetConfig

The manual provider's Open and SetConfig methods were
both using the result of "validate", which replaces
missing manual-specific attributes with their defaults.
Open and SetConfig should not alter the input config.

Fixes https://bugs.launchpad.net/juju-core/+bug/1347715
Increase socket timeout to 1 minute during bootstrap

We increase the socket timeout during bootstrap to
cope with slow disk I/O during machine initialisation.
Empirical evidence has shown this to decrease the
bootstrap failure rate on Microsoft Azure.

Fixes https://bugs.launchpad.net/juju-core/+bug/1351101
cmd/jujud: add test for InitializeState params
cmd/jujud: set socket timeout to bootstrap timeout
state: stop watchers if state.newState fails
Use NewSafeNetworker
Switch to only writing network config for maas (hack)
Minor tweaks
cmd/jujud: add test to ensure SocketTimeout is set to minimum
Merge pull request #483 from axw/lp1347715-provider-manual-open

provider/manual: don't change config in Open/SetConfig

The manual provider's Open and SetConfig methods were
both using the result of "validate", which replaces
missing manual-specific attributes with their defaults.
Open and SetConfig should not alter the input config.

Fixes https://bugs.launchpad.net/juju-core/+bug/1347715