← Back to branch summary

~free.ekanayaka/landscape-charm/cleanup-legacy-integration-tests

~free.ekanayaka/landscape-charm/cleanup-legacy-integration-tests

Viewing all changes in revision 251.

Committer: Free Ekanayaka
Date: 2015-04-20 08:56:42 UTC
mfrom: (248.1.2 landscape-charm)
Revision ID: free.ekanayaka@canonical.com-20150420085642-69xjrsi03pzfv91y

Merge from trunk, fix conflicts

files added:
hooks/website-relation-changed

files modified:
hooks/lib/callbacks/filesystem.py

hooks/lib/callbacks/tests/test_filesystem.py

hooks/lib/relations/haproxy.py

hooks/lib/relations/landscape.py

hooks/lib/relations/tests/test_haproxy.py

hooks/lib/relations/tests/test_landscape.py

hooks/lib/services.py

hooks/lib/tests/sample.py

hooks/lib/tests/test_services.py

hooks/lib/tests/test_templates.py

templates/landscape-server

templates/service.conf

tests/01-begin.py

tests/helpers.py

Show diffs side-by-side

added added

removed removed

hooks/lib/callbacks/filesystem.py

hooks/lib/callbacks/tests/test_filesystem.py

hooks/lib/relations/haproxy.py

hooks/lib/relations/landscape.py

hooks/lib/relations/tests/test_haproxy.py

hooks/lib/relations/tests/test_landscape.py

hooks/lib/services.py

hooks/lib/tests/sample.py

hooks/lib/tests/test_services.py

hooks/lib/tests/test_templates.py

hooks/website-relation-changed

templates/landscape-server

templates/service.conf

tests/01-begin.py

tests/helpers.py

Older »