lp:~abentley/charms/trusty/apache2/apache2-ports

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:charms/trusty/apache2 at revision 59

David Britton (community): Approve on 2015-02-09

Adam Israel (community): Approve on 2015-02-04

Review Queue (community): Needs Fixing (automated testing) on 2015-01-07

Diff: 287 lines (+133/-21)

5 files modified

hooks/hooks.py (+56/-16)
hooks/tests/test_balancer_hook.py (+3/-3)
hooks/tests/test_config_changed.py (+4/-1)
hooks/tests/test_hooks.py (+65/-0)
hooks/tests/test_vhost_config_relation.py (+5/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

64. By Aaron Bentley on 2015-02-14

Merged trunk into apache2-ports.

63. By Aaron Bentley on 2014-12-29

Fix failing tests.

62. By Aaron Bentley on 2014-12-29

Fix failing test.

61. By Aaron Bentley on 2014-12-29

Backport test fix.

60. By Aaron Bentley on 2014-12-29

Fix port handling.

59. By Aaron Bentley on 2014-12-29

Backport ports centralization.

58. By Haw Loeung on 2014-12-12

[r=aisrael] Add option to override supported SSL protocol and cipher suites; Enforce server's preference instead of browser/client and ship out Canonical IS recommended cipher suites by default. Also pull in changes from precise charm - lp:charms/apache2

57. By Matt Bruzek on 2014-10-31

[kwmonroe] Use python venv, fix lint errors, add simple deployment bundle test.

56. By Charles Butler on 2014-08-05

  David Britton 2014-06-28 apply same importerror check to trusty, keeping precise and trusty in sync.
  David Britton 2014-06-28 [merge] merge up
  David Britton 2014-06-20 port avoid-regen-cert to trusty.

55. By Matt Bruzek on 2014-06-23

[gnuoy] Fix default security config to have new format when apache 2.4 is installed.