Viewing all changes in revision 350.
- Committer: William Reade
- Date: 2011-09-16 14:07:03 UTC
- mfrom: (348.2.1 trunk)
- Revision ID: fwereade@gmail.com-20110916140703-zct6vufre93amefu
merge trunk
- 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/lib/lxc/data/ensemble-create => juju/lib/lxc/data/juju-create
- 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:
- Makefile
expand all
collapse all
added
removed
