← Back to branch summary

~brad-marshall/charms/trusty/nrpe-external-master/python-rewrite-fix-nrpe-fragments

~brad-marshall/charms/trusty/nrpe-external-master/python-rewrite-fix-nrpe-fragments

Viewing all changes in revision 41.

Committer: Liam Young
Date: 2015-03-06 16:15:38 UTC
mfrom: (39.1.1 nrpe-external-master)
Revision ID: liam.young@canonical.com-20150306161538-etkwxwattoi0l2ub

merged trunk in

files added:
charm-helpers-tests.yaml

tests/charmhelpers

tests/charmhelpers/__init__.py

tests/charmhelpers/contrib

tests/charmhelpers/contrib/__init__.py

tests/charmhelpers/contrib/amulet

tests/charmhelpers/contrib/amulet/__init__.py

tests/charmhelpers/contrib/amulet/deployment.py

tests/charmhelpers/contrib/amulet/utils.py

unit_tests

unit_tests/__init__.py

unit_tests/test_nrpe_utils.py

unit_tests/test_utils.py

files removed:
charm-helpers-tests.yaml

tests/charmhelpers

tests/charmhelpers/__init__.py

tests/charmhelpers/contrib

tests/charmhelpers/contrib/__init__.py

tests/charmhelpers/contrib/amulet

tests/charmhelpers/contrib/amulet/__init__.py

tests/charmhelpers/contrib/amulet/deployment.py

tests/charmhelpers/contrib/amulet/utils.py

files modified:
hooks/nrpe_utils.py

Show diffs side-by-side

added added

removed removed

charm-helpers-tests.yaml

charm-helpers-tests.yaml

hooks/nrpe_utils.py

tests/charmhelpers/

tests/charmhelpers/

tests/charmhelpers/__init__.py

tests/charmhelpers/__init__.py

tests/charmhelpers/contrib/

tests/charmhelpers/contrib/

tests/charmhelpers/contrib/__init__.py

tests/charmhelpers/contrib/__init__.py

tests/charmhelpers/contrib/amulet/

tests/charmhelpers/contrib/amulet/

tests/charmhelpers/contrib/amulet/__init__.py

tests/charmhelpers/contrib/amulet/__init__.py

tests/charmhelpers/contrib/amulet/deployment.py

tests/charmhelpers/contrib/amulet/deployment.py

tests/charmhelpers/contrib/amulet/utils.py

tests/charmhelpers/contrib/amulet/utils.py

unit_tests/__init__.py

unit_tests/test_nrpe_utils.py

unit_tests/test_utils.py

Older »