lp://staging/~ubuntu-branches/ubuntu/precise/juju/precise-201205032238
- Get this branch:
- bzr branch lp://staging/~ubuntu-branches/ubuntu/precise/juju/precise-201205032238
Branch merges
- Ubuntu branches: Pending requested
-
Diff: 32144 lines (+28942/-2268) (has conflicts)90 files modified.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
debian/changelog (+121/-0)
examples/oneiric/mysql/config.yaml (+1/-0)
examples/oneiric/mysql/hooks/db-relation-joined (+40/-0)
examples/oneiric/mysql/hooks/install (+25/-0)
examples/oneiric/mysql/hooks/start (+3/-0)
examples/oneiric/mysql/hooks/stop (+3/-0)
examples/oneiric/mysql/metadata.yaml (+17/-0)
examples/oneiric/mysql/revision (+1/-0)
examples/oneiric/php/config.yaml (+5/-0)
examples/oneiric/php/hooks/config-changed (+14/-0)
examples/oneiric/php/hooks/install (+49/-0)
examples/oneiric/php/hooks/start (+1/-0)
examples/oneiric/php/hooks/stop (+3/-0)
examples/oneiric/php/metadata.yaml (+4/-0)
examples/oneiric/php/revision (+1/-0)
examples/oneiric/wordpress/config.yaml (+7/-0)
examples/oneiric/wordpress/hooks/config-changed (+19/-0)
examples/oneiric/wordpress/hooks/db-relation-changed (+100/-0)
examples/oneiric/wordpress/hooks/install (+6/-0)
examples/oneiric/wordpress/hooks/start (+1/-0)
examples/oneiric/wordpress/hooks/stop (+3/-0)
examples/oneiric/wordpress/metadata.yaml (+10/-0)
examples/oneiric/wordpress/revision (+1/-0)
juju/agents/base.py (+343/-0)
juju/agents/tests/test_base.py (+1264/-633)
juju/agents/tests/test_machine.py (+244/-0)
juju/agents/unit.py (+233/-0)
juju/charm/tests/test_publisher.py (+228/-0)
juju/control/bootstrap.py (+41/-0)
juju/control/debug_log.py (+138/-0)
juju/control/destroy_service.py (+42/-0)
juju/control/remove_relation.py (+72/-0)
juju/control/remove_unit.py (+55/-0)
juju/control/status.py (+705/-0)
juju/control/terminate_machine.py (+80/-0)
juju/control/tests/test_destroy_service.py (+62/-0)
juju/control/tests/test_remove_relation.py (+198/-0)
juju/control/tests/test_remove_unit.py (+227/-0)
juju/environment/config.py (+263/-0)
juju/environment/tests/test_config.py (+742/-0)
juju/errors.py (+201/-0)
juju/hooks/commands.py (+248/-0)
juju/hooks/protocol.py (+482/-0)
juju/hooks/tests/test_communications.py (+410/-0)
juju/hooks/tests/test_invoker.py (+1452/-0)
juju/lib/lxc/__init__.py (+328/-0)
juju/lib/lxc/tests/test_lxc.py (+290/-0)
juju/lib/testing.py (+232/-0)
juju/machine/constraints.py (+244/-19)
juju/machine/tests/test_constraints.py (+201/-0)
juju/machine/unit.py (+280/-0)
juju/providers/common/tests/test_launch.py (+104/-0)
juju/providers/dummy.py (+208/-0)
juju/providers/ec2/__init__.py (+212/-0)
juju/providers/ec2/files.py (+122/-0)
juju/providers/ec2/tests/common.py (+224/-0)
juju/providers/ec2/tests/test_files.py (+223/-0)
juju/providers/ec2/tests/test_launch.py (+322/-0)
juju/providers/ec2/tests/test_provider.py (+231/-0)
juju/providers/ec2/tests/test_utils.py (+247/-0)
juju/providers/ec2/utils.py (+158/-0)
juju/providers/local/__init__.py (+258/-0)
juju/providers/orchestra/__init__.py (+116/-0)
juju/providers/orchestra/cobbler.py (+261/-0)
juju/providers/orchestra/launch.py (+59/-0)
juju/providers/orchestra/tests/common.py (+174/-0)
juju/providers/orchestra/tests/data/bootstrap_user_data (+64/-0)
juju/providers/orchestra/tests/test_bootstrap.py (+158/-0)
juju/providers/orchestra/tests/test_cobbler.py (+983/-0)
juju/providers/orchestra/tests/test_launch.py (+162/-0)
juju/providers/orchestra/tests/test_provider.py (+116/-0)
juju/state/errors.py (+407/-0)
juju/state/hook.py (+872/-435)
juju/state/relation.py (+919/-0)
juju/state/tests/common.py (+60/-0)
juju/state/tests/test_base.py (+875/-435)
juju/state/tests/test_errors.py (+261/-0)
juju/state/tests/test_hook.py (+853/-0)
juju/state/tests/test_initialize.py (+97/-0)
juju/state/tests/test_relation.py (+1896/-0)
juju/state/tests/test_service.py (+2934/-0)
juju/state/tests/test_topology.py (+1325/-0)
juju/state/tests/test_utils.py (+1418/-706)
juju/state/topology.py (+651/-0)
juju/tests/test_errors.py (+155/-0)
juju/unit/charm.py (+82/-40)
juju/unit/lifecycle.py (+707/-0)
juju/unit/tests/test_lifecycle.py (+1286/-0)
Branch information
- Owner:
- Ubuntu branches
- Status:
- Development
Recent revisions
- 11. By Clint Byrum
-
* New upstream snapshot
* d/p/fix-tests-without- aws-key. patch: Dropped as it has been
superseded by a better upstream fix (LP: #819329)
* d/p/no-write-sample- on-help. patch: Dropped, Applied upstream.
* d/p/disable-failing- zookeeper- test.patch refreshed. - 10. By Clint Byrum
-
* New upstream snapshot (LP: #962507 LP: #953258 LP: #965507).
* d/control: Depend and Build-Depend on python-oauth for MaaS.
* d/control: Drop dummy ensemble package and make breaks/replaces
broader to force removal of any ensemble package. (LP: #954492)
* d/control: Move lxc, libvirt-bin, and zookeeper to Suggests to
reduce the amount of packages installed on every node unecessarily
and also avoid conflicting when deploying into a libvirt-bin
default network VM (LP: #962389)
* d/rules: skip test suite when nocheck is set.
* d/rules: remove redundant dh_clean call
* d/juju.install: remove usr, with only one binary package this is
not necessary anymore and causes dh_install to fail because no
files are installed to debian/tmp anymore.
* d/rules,d/control, d/manpages, d/juju. manpages: Generate basic
manpage from online help. (LP: #966611)
* d/patches/no-write- sample- on-help. patch: Added so --help can be
safely run without a writable home dir on buildds. (LP: #957682) - 5. By Clint Byrum
-
d/control: Recommend components necessary for local provider except
apt-cacher-ng, which is suggested. (LP: #873540) Also depend on tmux
for debug-hooks and recommend byobu so the branding will be the same. - 4. By Clint Byrum
-
* New upstream snapshot.
* d/control: No longer build-dep or depend on python-argparse, as
it seems to cause fits with pkg_resources.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/quantal/juju