Increment juju to 1.21.beta4
Merge pull request #1183 from sinzui/inc-1.21.beta4

Increment juju to 1.21.beta4

Increment the juju devel and win installer version th 1.21-beta4. We may not release this version. If no regressions are reported about beta3, we will rename this version 1.20.0.

(Review request: http://reviews.vapour.ws/r/494/)
Add upgrade step to put the system identity back.
Tweaks following review.
Merge pull request #1187 from howbazaar/1.21-fix-juju-run

Add upgrade step to put the system identity back.

Forward port the 1.20 patch, with improvements.

The agent config is updated by the upgrade step.
The machine agent code that writes or removes the system identity is now moved into its own worker that runs after the upgrade steps have finished.  This avoids the race to remove and add the file.

(Review request: http://reviews.vapour.ws/r/497/)
Merge pull request #1196 from anastasiamac/Bug1394450-older-client-destroing-new-environment

Setting default network bridge name on config creation.

Older clients can't destroy newer environments because a) default network bridge name changed to empty string and b) reasonable default for network bridge name was only provided via getter.

This change moves the guess of reasonable default to config creation.

(Review request: http://reviews.vapour.ws/r/507/)
Merge pull request #1204 from anastasiamac/Bug1394450-old-client-cannot-destroy-new-env

Merge pull request #1196 from anastasiamac/Bug1394450-older-client-destr...

...oing-new-environment

Setting default network bridge name on config creation.

Older clients can't destroy newer environments because a) default network bridge name changed to empty string and b) reasonable default for network bridge name was only provided via getter.

This change moves the guess of reasonable default to config creation.

(Review request: http://reviews.vapour.ws/r/507/)

(Review request: http://reviews.vapour.ws/r/514/)
Merge pull request #1206 from wallyworld/fix-deprecation-warning

Ensure correct value is logged in config deprecation warning

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

When logging a warning about using provisioner-safe-mode, the warning message had the wrong suggested value for the new harvest mode setting.  The logger function now is given what the new value should be so it can use it in the log message.

(Review request: http://reviews.vapour.ws/r/516/)
Merge pull request #1207 from wallyworld/fix-deprecation-warning-1.21

Merge pull request #1206 from wallyworld/fix-deprecation-warning

Ensure correct value is logged in config deprecation warning

Fixes: https://bugs.launchpad.net/juju-core/+bug/1394751

When logging a warning about using provisioner-safe-mode, the warning message had the wrong suggested value for the new harvest mode setting.  The logger function now is given what the new value should be so it can use it in the log message.

(Review request: http://reviews.vapour.ws/r/516/)

(Review request: http://reviews.vapour.ws/r/517/)
Increment version to stable 1.21.0.
fix Juju version to be 1.21.0.
Only start the identity-file-writer if managing state.
Merge pull request #1225 from howbazaar/1.21-identity-writer-fix

Only start the identity-file-writer if managing state.

Same fix as in master.

(Review request: http://reviews.vapour.ws/r/535/)
Check the result of the symlink.
Merge pull request #1226 from howbazaar/1.21-fix-jujuc-links

Check the result of the symlink.

When creating the jujuc symlinks, an absolute path became relative by reading the symlink.

While this isn't a cohesive more permanent solution (i.e. sorting out the whole tools relative/absolute malarkey), it does make 1.21 work.

(Review request: http://reviews.vapour.ws/r/536/)
worker/rsyslog: use namespace in the syslog tag

Without this, the syslog client may not be using the syslog tag
expected by rsyslogd on the state servers. This issue only affected
the local provider.

Fixes LP 1396796.
Merge pull request #1229 from mjs/syslog-client-tag-fix-1.21

worker/rsyslog: use namespace in the syslog tag

Without this, the syslog client may not be using the syslog tag expected by rsyslogd on the state servers. This issue only affected the local provider.

Fixes LP 1396796.

(Review request: http://reviews.vapour.ws/r/539/)
Merge pull request #1215 from sinzui/inc-1.21.0

Increment version to stable 1.21.0.

Set the 1.21 branch to stable 1.21.0

(Review request: http://reviews.vapour.ws/r/524/)
state: relaxed checking of container relations

Container scoped relations are only allowed as long a there's at least
one subordinate service involved. Previously there had to be exactly
one subordinate service but it turns out some people where relying on
being to establish container scoped relations between 2 subordinate
services.

This is part of the fix for LP #1396625.
state: relaxed InferEndpoints container relations check

InferEndpoints now allows container relations as long as there's at
least one subordinate service involved.

This is part of the fix for LP #1396625.