Created by Nate Finch on 2014-05-28 and last modified on 2014-05-28
Get this branch:
bzr branch lp:~natefinch/juju-core/053-nolog-jenv
Only Nate Finch can upload to this branch. If you are Nate Finch please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Nate Finch

Recent revisions

2715. By Nate Finch on 2014-05-28

remove logging of jenv, since it contains sensitive data

2714. By Andrew Wilkins on 2014-05-09

[r=axwalk],[bug=1313785] cmd/juju: check use-proxy before resolving address

We were translating machin/unit IDs to internal addresses
even if use-proxy=false. This manifested most prominently
when attempting to juju ssh to a machine or unit in a 1.18

Fixes lp:1313785


2713. By Ian Booth on 2014-05-09

[r=wallyworld],[bug=1314686] Split out Ubuntu series lookup

Support for querying Ubuntu series info was
in the simplestreams package. We needed to add
support for "utopic" but it wasn't obvious
where to do it. A previous attempt was made
but only a test constant was changed. This
branch extracts the series stuff into a new
juju/ubuntu package and adds proper "utopic"

We may well need to look at this again when we
want to add supported series support for other
OS's but for now this should be good enough.


2712. By Andrew Wilkins on 2014-05-09

[r=axwalk],[bug=1315216] Introduce lxc-use-clone, ContainerManagerConfig

A new lxc-use-clone config attribute and a new
ContainerManagerConfig provisioner API are introduced.
If lxc-use-clone is set to true, then the LXC
provisioner will be configured to use cloning
regardless of provider type. This setting is currently
immutable; additional work will be required to support
reacting to changes and reconfiguring the provisioner.

Fixes lp:1315216


2711. By Tim Penhey on 2014-05-09

[r=thumper] Add some developer docs for writing tests.

Obviously there is a lot that could be written, but this
is a start.


2710. By John A Meinel on 2014-05-08

[r=jameinel] bzr: fix a test about paths

When bzr looks up the root of a branch, it expands symlinks to get the
'canonical' path. On Mac OS X, /tmp and /var are actually symlinks to
/private/tmp and /private/var which broke the tests.

So just EvalSymlinks on the path and it works again.


2709. By John A Meinel on 2014-05-08

[r=jameinel] version/version.go: refactor to allow series on Mac

This pulls out a bunch of code for determining the series of the current host and makes it possible to implement platform specific calls.

It then exposes Mac platform as "darwin13" which matches the $OSTYPE environment variable. Most of the code is written so that it can be tested on all platforms, and only the last little connection is done as platform specific code.

I don't know if we plan on doing OS Version specific binaries for Mac/Win like we do for Ubuntu (trusty vs precise), but I figured I could start with the specific version, and we can decide if we want to do version agnostic later. ('darwin' vs 'darwin13')

I know we intend that the 'juju' client is supported on Mac, and this is a step towards getting the test suite to pass there. Right now the first test that wants 'tools' fails because the tools version is "unknown", even though all of the code builds successfully.

2708. By Andrew Wilkins on 2014-05-08

[r=axwalk] environs/manual: use old AddMAchines API

Manual provisioning was implicitly changed
to use the new AddMachinesV2 client API,
with no backwards compatibility failover.
I've changed it to explicitly use the old
API, since we do not require anything of
the new one.

Fixes lp:1317267


2707. By Ian Booth on 2014-05-08

[r=jameinel] Merge 1.18 into trunk.

There were a bunch of conflicts from things that had to be backported but in a slightly different way. I verified that all the conflicts could be resolved in favor of current code.

There was one patch that wasn't in trunk at all, but according to the bug "didn't apply to trunk".
However, I think at least one of the assertions (bootstrap machine has its addresses set) does still apply, so I kept that bit.

2706. By Menno Finlay-Smits on 2014-05-08

[r=menno.smits],[bug=1302005] cmd/juju: deprecate --series, added --upload-series

Emit a deprecation warning to stderr when --series is used

To make testing easier an interface is now used to allow the calls
made by BootstrapCommand.Run to environs/bootstrap to be mocked out.



Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.