lp:~hloeung/charms/trusty/apache2-subordinate/trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~canonical-sysadmins/charms/trusty/apache2-subordinate/trunk at revision 64

Paul Gear (community): Approve on 2015-03-23

Diff: 59 lines (+21/-2)

4 files modified

.bzrignore (+1/-0)
config.yaml (+13/-1)
revision (+0/-1)
templates/apache-vhost.j2 (+7/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

60. By Haw Loeung on 2015-03-19

Merge changes from upstream.

59. By Haw Loeung on 2015-03-19

Add .bzrignore and ignore/remove revision.

58. By Haw Loeung on 2015-03-19

Add SSLProtocol, SSLCipherSuite, and SSLHonorCipherOrder apache config directives and port over defaults we're using in the apache2 charm.

57. By Jacek Nykis on 2015-02-16

Merged Nick's documentation update and new hooks

56. By Nick Moffitt on 2015-02-06

merge jacekn's newline-stripping in filenames

55. By Jacek Nykis on 2015-01-30

Merged Nick's changes

54. By Jacek Nykis on 2015-01-29

Merged Nick's template changes

53. By Nick Moffitt on 2015-01-27

merge docstring from jacekn

52. By Nick Moffitt on 2015-01-27

merge jacekn's swift-log-archive support

51. By Nick Moffitt on 2015-01-20

merge jacekn's support for proxypass