← Back to branch summary

~mojo-maintainers/mojo/trusty-packaging

~mojo-maintainers/mojo/trusty-packaging

Viewing all changes in revision 459.

Committer: Tom Haddon
Date: 2020-01-28 16:34:31 UTC
mfrom: (434.6.81 mojo)
Revision ID: tom.haddon@canonical.com-20200128163431-lhpxjm49kjfwah35

[mthaddon,trivial] Merge trunk

files added:
mojo/tests/testdata/deploy-config-charmstore-charms.yaml

mojo/tests/testdata/deploy-config-local-charms.yaml

mojo/tests/testdata/deploy-config-mixed-charms.yaml

files modified:
debian/changelog

docs/mojo/index.md

mojo/__init__.py

mojo/juju/debuglogs.py

mojo/phase.py

mojo/tests/test_phase.py

Show diffs side-by-side

added added

removed removed

debian/changelog

docs/mojo/index.md

mojo/__init__.py

mojo/juju/debuglogs.py

mojo/tests/test_phase.py

mojo/tests/testdata/deploy-config-charmstore-charms.yaml

mojo/tests/testdata/deploy-config-local-charms.yaml

mojo/tests/testdata/deploy-config-mixed-charms.yaml

Older »