~brad-marshall/charms/trusty/keystone/haproxy-add-timeout

Viewing all changes in revision 52.2.8.

  • Committer: James Page
  • Date: 2014-03-27 10:54:38 UTC
  • mfrom: (55.1.22 keystone)
  • mto: (52.4.7 keystone)
  • mto: This revision was merged to the branch mainline in revision 60.
  • Revision ID: james.page@canonical.com-20140327105438-oid8czi9ud51iut1
Merge ssl-everywhere branch (may break stuff)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: