Created by Dave Cheney on 2014-04-04 and last modified on 2014-04-04
Get this branch:
bzr branch lp:~dave-cheney/juju-core/124-worker-peergrouper-mock-fix
Only Dave Cheney can upload to this branch. If you are Dave Cheney please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Dave Cheney

Recent revisions

2566. By Dave Cheney on 2014-04-04

Mock test should order results

2565. By Andrew Wilkins on 2014-04-04

[r=axwalk] provider/azure: ensure tests work correctly

Some tests I wrote call StartInstance to
check the parameters passed to createInstance.
The tests don't actually verify that it called
that method successfully, and all validation
is done within the method. Updated the tests
to ensure from outside that the method is called.


2564. By Tim Penhey on 2014-04-04

[r=thumper] Have the apiserver know the logdir

The agent config now knows the logdir. In some places
the entire agent config is passed through, but in order
to keep the changes small(ish), we only pass through
the logdir (additionally).

This did require a few tweaks to tests, and in particular
the addition of LogDir to the base ConnSuite.

This logdir is used by the upcoming debug-log api.


2563. By Tim Penhey on 2014-04-04

[r=thumper] Extend the tailer utility.

When looking at the pyjuju debug-log, there was a replay
function that allowed getting the log from the start.
There was no way to tell the tailer to start from the
beginning of the file.

I changed the meaning of NewTailer to be one that doesn't
do any seeking. The NewTailerBacktrack does seek to the end,
and then goes back a certain number of lines.

There was a bug in the backtrack tailer when zero lines
were passed in. This is fixed and a test added.

The number of lines to look back is now a uint, as negative
values make no sense at all.


2562. By Ian Booth on 2014-04-04

[r=wallyworld],[bug=1301464] Port changes from 1.18 which address bug 1301464

Change the internals of the megawatcher to ensure
that machine addresses are correct and that the
public and private addresses for untis come from
the assigned machine.

2561. By Jason Hobbs on 2014-04-03

[r=natefinch],[bug=1285410] Fix architecture name for armhf.

juju-tools for arm 32-bit all use "armhf" as the arch name; juju-core should use it too, rather than "arm".

2560. By Casey Marshall on 2014-04-03

[r=cmars] Add series: attribute to charm metadata.

Allows charms to declare a preferred series. The field is optional, but if
set, it must be a valid series identifier, using the same criteria as a charm

2559. By Casey Marshall on 2014-04-03

[r=cmars],[bug=1290824] Resolve series with charm store in juju client.

For the deploy and upgradecharm commands, when a series is not provided, and a
default-series is not set in the environment config, the client will resolve
the series with the charm store, through the state server. If the client is
working with a 1.16 state server, it will resolve the series directly with the
charm store.

Existing environments will have a default-series, so they should have no
change in series selection.

New environments will continue to support the default-series config setting,
but it can be omitted, and is not set by default.


2558. By William Reade on 2014-04-03

[r=fwereade] testing/filetesting: new package

...extracted from utils/zip, and given some actual tests, which (surprise
surprise) made a few problems apparent.


2557. By Andrew Wilkins on 2014-04-03

[r=axwalk] state: no pre-checks for injected machines

We should not be second guessing the bootstrap agent or
manual provisioning. If the instance-id is non-empty when
adding a machine to state, do not check SupportsUnitPlacement.


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.