fix for lp:1214209: Allow add-machine to take a -n param for adding multiple machines in a single command
don't allow -n when specifying a placement directive
better output for add-machine -n
Replicaset test duplicated for ipv6
Refactor tests to avoid duplication
Add code comment
Typo fix
Revert a change that was killing the non-ipv6 test
Update testing dependency
Merge
Modified upstart config to ensure proper log perms.
more consistent error output for single and multiple adds
Modified Upstart config to grant correct permissions to agent logs.
Merge branch 'master' of https://github.com/juju/juju into 1286518-log-perms-2
Updated tests to reflect use of script.
Corrected search for exec block to work with new script block.
Merge pull request #198 from mattyw/add-n-machines

Allow add-machine to take a -n param

Fix for https://bugs.launchpad.net/juju-core/+bug/1214209

Allow add-machine to take a -n param to add multiple machines
Merge pull request #238 from voidspace/replicaset-ipv6

Add a test for replicasets with ipv6

replicaset/replicaset_test: add a test for replicasets with ipv6
Improved addresses handling, IPv6 endpoints not dropped when caching, Lots more networking tests
Merge pull request #243 from dimitern/do-not-ignore-ipv6-api-endpoints

Allow IPv6 API endpoints; Improved IPv4/IPv6 addresses handling.

Summary of the changes:
 * API IPv6 endpoints are cached, just like IPv4 ones.
 * Introduced network.ScopeLinkLocal and detection.
 * Improved addresses selection (public/internal) in
   the network package not to discriminate IPv6 over IPv4.
 * Added network.PreferIPv6 global flag (false by default)
   as a less intrusive way to tweak addresses selection to
   prefer IPv6 addresses when available. This needs to be
   exposed as an environment setting in a follow-up.
 * Added a lot of tests for both IPv4 and IPv6 addresses
   in the network package and in the openstack provider.
 * As a side-effect, fixed bug http://pad.lv/1328429.

With this PR, we no longer favor IPv4 over IPv6, and this allows us to
improve IPv6 support across the board. Some follow-up will be needed
to fix a few minor issues, like not verifying addesses of type
"hostname" (lots of tests need to stop using hostnames like
"zerotwothreefour" or "public", etc. and start using "example.com" or
subdomains thereof). Another improvement will be to expose the
PreferIPv6 flag to the end-user somehow.