← Back to branch summary

~1chb1n/charm-helpers/amulet-rmq-helpers

~1chb1n/charm-helpers/amulet-rmq-helpers

Viewing all changes in revision 433.

Committer: Ryan Beisner
Date: 2015-08-17 14:58:19 UTC
mfrom: (427.2.4 charm-helpers)
Revision ID: ryan.beisner@canonical.com-20150817145819-qvq6sr4j0y8hgb59

rebase, resolve conflicts

files added:
tests/contrib/amulet/__init__.py

files modified:
charmhelpers/contrib/amulet/utils.py

charmhelpers/core/host.py

charmhelpers/core/services/helpers.py

tests/contrib/amulet/test_utils.py

tests/core/test_host.py

tests/core/test_services.py

Show diffs side-by-side

added added

removed removed

charmhelpers/contrib/amulet/utils.py

charmhelpers/core/host.py

charmhelpers/core/services/helpers.py

tests/contrib/amulet/__init__.py

tests/contrib/amulet/test_utils.py

tests/core/test_host.py

tests/core/test_services.py

Older »