Created by Horacio Durán on 2014-05-14 and last modified on 2014-05-14
Get this branch:
bzr branch lp:~hduran-8/juju-core/trunk
Only Horacio Durán can upload to this branch. If you are Horacio Durán please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Horacio Durán

Recent revisions

2725. By Horacio Durán on 2014-05-13

[r=hduran-8],[bug=1304116] Corrected restore tu support current juju code

Current restore plugin, takes a backup which contains
a dump of the mongodb for the backed up machine and
several configuration files, it bootstraps a new
machine and:
Deletes the fresh db
Loads the dump
Places the files instead of the fresh machine ones
Restarts services.
Since replicaset was introduced the db load was not
working properly. A replicaset initiate with a fresh
config was added to solve it.


R=jameinel, klyachin

2724. By Wayne Witzel III on 2014-05-13

[r=wwitzel3],[bug=1310268] utils/syslog: log to all state machines


2723. By William Reade on 2014-05-13

[r=fwereade] Rudimentary beginnings of architecture docs. More to come, but no point keeping these secret.


2722. By Andrew Wilkins on 2014-05-13

[r=axwalk],[bug=1317197] Take hook exec lock in container host init

When initialising the host for a container type,
we will install packages (lxc, kvm, etc.); this can
conflict with hook execution. This CL modifies the
container initialisation code to acquire the hook
execution lock when initialisting the host to avoid
the conflict.

Fixes lp:1317197


2721. By Andrew Wilkins on 2014-05-13

[r=axwalk] Invert envcmd relationship

Previously we embedded EnvCommandBase in all commands
requring an environment, and EnvCommandBase included
everything (SetFlags, and Init). The problem with this
is that it was easy to miss initialisation of the
EnvCommandBase type (this happened a few times), which
leads to bad things happening like sync-tools destroying

I have inverted the relationship so that we now have
envcmd.EnvironCommand, an interface that extends Command
with a SetEnvName method, and EnvCommandBase, which
implements EnvironCommand. A new method, envcmd.Wrap takes
an EnvironCommand and creates a Command that calls
SetEnvName prior to the wrapped method's Init method. If
the environment name cannot be determined, the wrapping
command will error out early.


2720. By John A Meinel on 2014-05-12

[r=jameinel],[bug=1301353] testing/mgo: use /usr/lib/juju/bin/mongod

As part of fixing bug #130135, the test suite can now search PATH for
'mongod' and if it doesn't find it, also search for
'/usr/lib/juju/bin/mongod' and disable the store's JS tests.

I came across some other parts of the codebase that were panic() ing
when mongod failed to start, so I fixed that as well.


2719. By Menno Finlay-Smits on 2014-05-12

[r=menno.smits] juju/cmd: use RunCommand throughout BootstrapSuite

Replaced uses of cmd.Main with with the RunCommand test helper in
the bootstrap command tests to avoids test boilerplate and make
checking of test results more straightforward.



2718. By Jesse Meek on 2014-05-12

[r=waigani],[bug=1318429] Correct debug-log help

Change help message for exclude to read:
"do not show log messages for these entities"


2717. By Jesse Meek on 2014-05-11

[r=waigani],[bug=1299120] Fix 1299120 command aliases

Fix bug 1299120 by ensuring that the
preferred command is not displayed as
an alias of another command in juju
help commands.

Change file and function names to
be consistant with the preferred



2716. By Curtis Hovey on 2014-05-11

[r=sinzui] Increment juju devel to 1.19.3.

Update juju version and win installer to 1.19.3.


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.