← Back to branch summary

~jacekn/charms/precise/haproxy/haproxy-updates

~jacekn/charms/precise/haproxy/haproxy-updates

Viewing all changes in revision 88.

Committer: Ryan Finnie
Date: 2014-01-27 17:33:38 UTC
mfrom: (87.1.1 haproxy)
Revision ID: ryan.finnie@canonical.com-20140127173338-f0tnl2lh3k0thcm7

[rfinnie, r=jacekn] Merge upstream

files modified:
Makefile

README.md

config.yaml

hooks/hooks.py

hooks/tests/test_helpers.py

hooks/tests/test_peer_hooks.py

hooks/tests/test_reverseproxy_hooks.py

hooks/tests/test_website_hooks.py

Show diffs side-by-side

added added

removed removed

hooks/tests/test_helpers.py

hooks/tests/test_peer_hooks.py

hooks/tests/test_reverseproxy_hooks.py

hooks/tests/test_website_hooks.py

Older »