Viewing all changes in revision 321.2.15.
- Committer: kapil.thangavelu at canonical
- Date: 2011-09-19 23:29:57 UTC
- mto: This revision was merged to the branch mainline in revision 353.
- Revision ID: kapil.thangavelu@canonical.com-20110919232957-2lwxbtfz2k94b4yp
more conflict resolving against juju rename
- files renamed:
- ensemble/ => juju/
- files modified:
- juju/charm/tests/test_publisher.py
expand all
collapse all
added
removed
