Viewing all changes in revision 327.
- Committer: kapil.thangavelu at canonical
- Date: 2012-03-31 03:34:10 UTC
- mfrom: (316.1.11 states-with-principals)
- Revision ID: kapil.thangavelu@canonical.com-20120331033410-mj2znr90wnm0j88b
merge trunk
- files added:
- COPYING
- examples/oneiric
- juju/charm/tests/repository/series
- juju/charm/tests/repository/series/configtest
- juju/charm/tests/repository/series/configtest/hooks
- juju/charm/tests/repository/series/dummy/.dir
- juju/charm/tests/repository/series/dummy/hooks
- juju/environment/tests/data
- juju/lib/lxc
- juju/lib/lxc/data
- juju/lib/lxc/tests
- juju/providers/common/tests/data
- juju/providers/local
- juju/providers/local/tests
- files removed:
- bin/ensemble-make-image
- debian
- 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
- examples/readme.txt => examples/README
- examples/mysql/ => examples/oneiric/mysql/
- examples/php/ => examples/oneiric/php/
- examples/wordpress/ => examples/oneiric/wordpress/
- ensemble/ => juju/
- ensemble/formula/ => juju/charm/
- ensemble/formula/tests/repository/dummy/ => juju/charm/tests/repository/series/dummy/
- ensemble/formula/tests/repository/mysql2/ => juju/charm/tests/repository/series/mysql-alternative/
- ensemble/formula/tests/repository/mysql/ => juju/charm/tests/repository/series/mysql/
- ensemble/formula/tests/repository/new/ => juju/charm/tests/repository/series/new/
- ensemble/formula/tests/repository/old/ => juju/charm/tests/repository/series/old/
- ensemble/formula/tests/repository/riak/ => juju/charm/tests/repository/series/riak/
- ensemble/formula/tests/repository/varnish2/ => juju/charm/tests/repository/series/varnish-alternative/
- ensemble/formula/tests/repository/varnish/ => juju/charm/tests/repository/series/varnish/
- ensemble/formula/tests/repository/wordpress/ => juju/charm/tests/repository/series/wordpress/
- ensemble/control/shutdown.py => juju/control/destroy_environment.py
- ensemble/control/tests/test_shutdown.py => juju/control/tests/test_destroy_environment.py
- 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/ec2/connect.py => juju/providers/common/connect.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
