← Back to branch summary

~abentley/charms/trusty/apache2/apache-website

~abentley/charms/trusty/apache2/apache-website

Viewing all changes in revision 79.

Committer: Aaron Bentley
Date: 2015-04-15 20:23:01 UTC
mfrom: (56.4.7 apache2)
Revision ID: aaron.bentley@canonical.com-20150415202301-8sbei1eiol8ywp6a

Merged trunk into apache2-website-interface.

files added:
hooks/charmhelpers/fetch/giturl.py

tests/20-mpm-test.py

files modified:
Makefile

README.md

charm-helpers.yaml

config-manager.txt

config.yaml

data/openssl.cnf

hooks/charmhelpers/__init__.py

hooks/charmhelpers/contrib/__init__.py

hooks/charmhelpers/contrib/charmsupport/__init__.py

hooks/charmhelpers/contrib/charmsupport/nrpe.py

hooks/charmhelpers/contrib/charmsupport/volumes.py

hooks/charmhelpers/core/__init__.py

hooks/charmhelpers/core/hookenv.py

hooks/charmhelpers/fetch/__init__.py

hooks/charmhelpers/fetch/archiveurl.py

hooks/charmhelpers/fetch/bzrurl.py

hooks/hooks.py

hooks/tests/test_config_changed.py

hooks/tests/test_create_vhost.py

hooks/tests/test_nrpe_hooks.py

tests/10-bundles-test.py

Show diffs side-by-side

added added

removed removed

charm-helpers.yaml

config-manager.txt

data/openssl.cnf

hooks/charmhelpers/__init__.py

hooks/charmhelpers/contrib/__init__.py

hooks/charmhelpers/contrib/charmsupport/__init__.py

hooks/charmhelpers/contrib/charmsupport/nrpe.py

hooks/charmhelpers/contrib/charmsupport/volumes.py

hooks/charmhelpers/core/__init__.py

hooks/charmhelpers/core/hookenv.py

hooks/charmhelpers/fetch/__init__.py

hooks/charmhelpers/fetch/archiveurl.py

hooks/charmhelpers/fetch/bzrurl.py

hooks/charmhelpers/fetch/giturl.py

hooks/tests/test_config_changed.py

hooks/tests/test_create_vhost.py

hooks/tests/test_nrpe_hooks.py

tests/10-bundles-test.py

tests/20-mpm-test.py

Older »