← Back to branch summary

~adam-collard/landscape-charm/install-sources-keys

~adam-collard/landscape-charm/install-sources-keys

Viewing all changes in revision 297.3.8.

Committer: Danilo Šegan
Date: 2015-06-05 09:10:45 UTC
mfrom: (297.2.11 charm-errors)
mto: This revision was merged to the branch mainline in revision 306.
Revision ID: danilo@canonical.com-20150605091045-9zuz3ppy9e7z8ixo

Merge charm-errors/trunk.

files added:
exec.d

hooks/leader-elected

files modified:
Makefile

charmhelpers/core/hookenv.py

charmhelpers/core/services/base.py

charmhelpers/fetch/giturl.py

lib/error.py

lib/relations/haproxy.py

lib/relations/tests/test_haproxy.py

lib/services.py

lib/tests/sample.py

lib/tests/stubs.py

lib/tests/test_services.py

lib/tests/test_templates.py

templates/landscape-server

Show diffs side-by-side

added added

removed removed

charmhelpers/core/hookenv.py

charmhelpers/core/services/base.py

charmhelpers/fetch/giturl.py

hooks/leader-elected

lib/relations/haproxy.py

lib/relations/tests/test_haproxy.py

lib/services.py

lib/tests/sample.py

lib/tests/stubs.py

lib/tests/test_services.py

lib/tests/test_templates.py

templates/landscape-server

Older »