generate-tools now merges metadata from different streams
Review fixes
Small tweak
Small tweak
Introduce constants
Do not read entire charm into memory when downloading
Small tweaks
Merge pull request #1001 from wallyworld/simplestreams-merge

generate-tools now merges metadata from different streams

Fixes: https://bugs.launchpad.net/juju-core/+bug/1386509

juju metadata generate-tools creates simplestreams metadata for tools tarballs.
When run more than once, it now appends any new metadata for a new stream to the existing metadata.
Merge pull request #1012 from wallyworld/local-charm-memory

Do not read entire charm into memory when downloading

Fixes: https://bugs.launchpad.net/bugs/1386405

Do not pull entire charm into memory when downloading.
cmd/juju: update docs with info on placement directives

Also, bring add-machine docs up-to-date and a bit more cohesive.

Fixes https://bugs.launchpad.net/juju-core/+bug/1387421
cmd/juju: permit user@ in scp/ssh target

The "juju ssh" and "juju scp" commands now
allow "user@" in the target. For example,
you can now do "juju ssh jenkins@jenkins/0"
to ssh to the first jenkins/0 unit as the
jenkins user.

Also, fix examples and clarify help for
"juju scp" regarding passing additional
arguments to "scp".

Fixes https://bugs.launchpad.net/juju-core/+bug/1387766
Fixes https://bugs.launchpad.net/juju-core/+bug/1387640
Fix typos
Merge pull request #1013 from axw/lp1387421-juju-help-placement

cmd/juju: update docs with info on placement directives

Also, bring add-machine docs up-to-date and a bit more cohesive.

Fixes https://bugs.launchpad.net/juju-core/+bug/1387421
provider/azure: make boilerplate <> usage consistent

Remove <> from boilerplate values for consistency's
sake, to reduce confusion about what needs replacing.
This matches the docs.

Fixes https://bugs.launchpad.net/juju-core/+bug/1381289
Allow env-set to handle deprecated attributes
Tweak test
Merge pull request #1014 from axw/lp1387766-juju-scp-username

cmd/juju: permit user@ in scp/ssh target

The "juju ssh" and "juju scp" commands now
allow "user@" in the target. For example,
you can now do "juju ssh jenkins@jenkins/0"
to ssh to the first jenkins/0 unit as the
jenkins user.

Also, fix examples and clarify help for
"juju scp" regarding passing additional
arguments to "scp".

Fixes https://bugs.launchpad.net/juju-core/+bug/1387766
Fixes https://bugs.launchpad.net/juju-core/+bug/1387640
Merge pull request #1015 from axw/lp1381289-azure-boilerplate-consistency

provider/azure: make boilerplate <> usage consistent

Remove <> from boilerplate values for consistency's
sake, to reduce confusion about what needs replacing.
This matches the docs.

Fixes https://bugs.launchpad.net/juju-core/+bug/1381289
Make add-metric test independent of map ordering.
Allow empty values in juju set-env.