Merge branch 'master' of https://github.com/juju/juju
Merge branch 'master' of https://github.com/juju/juju
Merge branch 'master' of https://github.com/juju/juju
Fix wrench build on Windows
Merge branch 'master' of https://github.com/juju/juju
KVM containers can now be created using a user-provided SimpleStreams URL as a base.
Bootstrap Endpoint Address

After Bootstrap returns successfully, get the bootstrap instance and
write its addresses to jenv/environ info/connection info.
Apt-get upgrades are now optional.
Merge branch 'master' of https://github.com/juju/juju into endpoint-on-bootstrap-take3

Conflicts:
	cmd/envcmd/environmentcommand.go
	cmd/juju/bootstrap_test.go
Corrections from round #1 of reviews.
Corrections from round 2 of reviews.
Fixed nil-reference panic.
fix formatting error in test
Generate CA Certificates that are valid for a bit further back in time.

See bug #1352944. We were generating certificates that were valid 5 minutes ago, to avoid
problems with the clock on the client being out of sync with the clock on the server, but
it seems 5 minutes isn't quite enough to account for real world clock skew. So bump it
up to 1 week.
add some comments about what we are testing.

Also, do the same work for Server and Client certs as well as the CA cert.
Refactored networker significantly to simplify it and improved testing and logging
Merge pull request #593 from dimitern/networker-takes-machinetag

Refactored networker significantly to simplify it and improved testing and logging.

Summary of changes:
 * No more using global variables.
 * Using names.MachineTag internally, not a string.
 * No state split in 3 places and coupled in a way making it very hard to test (dropped state.go and implemented ConfigFile which knows how to read its data and render its own config).
 * No more reading and parsing network config files, just rewritting them with managed config as needed.
 * VLAN module loading is only done if needed.
 * Much better and simpler tests.
 * Live tested on MAAS and local (trusty, precise, utopic).
 * Disabling a physical interface causes any dependents to be disabled as well (i.e. VLANs and other virtual interfaces with the same MAC).
 * Rather than parsing (obsolete) network config files, the available network interfaces on the machine are discovered using the net package's functions (updates happen in real-time).
 * Much, much better logging (mostly on DEBUG level, but not always)
 * Not a simple NotifyWorker anymore, as it needs to do more things, i.e. implemented a full-scale worker loop, etc.
 * IMO much easier to read, understand and maintain the code after refactoring.
Modified test to reflect new default of preferring updates/upgrades.
Merge branch 'master' of https://github.com/juju/juju
Merge pull request #597 from davecheney/state-fix-logf-in-tests

fix formatting error in test

What it says on the tin.