Viewing all changes in revision 340.1.5.
- Committer: kapil.thangavelu at canonical
- Date: 2011-09-16 18:08:38 UTC
- mfrom: (351 trunk)
- mto: This revision was merged to the branch mainline in revision 352.
- Revision ID: kapil.thangavelu@canonical.com-20110916180838-034qz2wli5nlj7mr
merge trunk, resolve conflict
- files added:
- docs/source/generate_modules.py
- juju/lib/lxc
- juju/lib/lxc/data
- juju/lib/lxc/tests
- juju/providers/common/tests/data
- juju/providers/lxc
- juju/providers/lxc/tests
- files renamed:
- bin/ensemble => bin/juju
- bin/ensemble-admin => bin/juju-admin
- bin/ensemble-log => bin/juju-log
- docs/source/formula-upgrades.rst => docs/source/charm-upgrades.rst
- docs/source/formula.rst => docs/source/charm.rst
- docs/source/drafts/formula-namespaces.rst => docs/source/drafts/charm-namespaces.rst
- docs/source/ensemble-drafts.rst => docs/source/juju-drafts.rst
- docs/source/ensemble-internals.rst => docs/source/juju-internals.rst
- docs/source/write-formula.rst => docs/source/write-charm.rst
- ensemble/ => juju/
- ensemble/formula/ => juju/charm/
- ensemble/control/tests/test_upgrade_formula.py => juju/control/tests/test_upgrade_charm.py
- ensemble/control/upgrade_formula.py => juju/control/upgrade_charm.py
- ensemble/providers/orchestra/tests/data/bootstrap_late_command => juju/providers/orchestra/tests/data/bootstrap_user_data
- ensemble/providers/orchestra/tests/data/launch_late_command => juju/providers/orchestra/tests/data/launch_user_data
- ensemble/state/formula.py => juju/state/charm.py
- ensemble/state/tests/test_formula.py => juju/state/tests/test_charm.py
- ensemble/unit/formula.py => juju/unit/charm.py
- ensemble/unit/tests/test_formula.py => juju/unit/tests/test_charm.py
- misc/bash_completion.d/ensemble => misc/bash_completion.d/juju
- files modified:
- .bzrignore
expand all
collapse all
added
removed
