lp:~free.ekanayaka/landscape-charm/no-combo-loader-support

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~landscape/landscape-charm/stable at revision 218

Данило Шеган (community): Approve on 2015-02-05

Geoff Teale (community): Approve on 2015-02-05

Chad Smith: Pending requested 2015-02-04

Diff: 289 lines (+105/-26)

3 files modified

hooks/hooks.py (+28/-7)
hooks/test_hooks.py (+77/-5)
tests/01-begin.py (+0/-14)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1417971: We should support LDS packages without combo-loader

Medium

Fix Released

Link a bug report

Related blueprints

219. By Free Ekanayaka on 2015-02-04

Fix combo-loader apache rule

218. By Free Ekanayaka on 2015-02-04

Add support for LDS packages without combo-loader

217. By David Britton on 2015-01-27

After testing, merge latest from trunk to stable.
- Benji York 2015-01-22 [merge] Merge bug-1411677-license-parsing-does-not-handle-extra-newline [f=1411677] [r=d...
- Free Ekanayaka 2015-01-19 [merge] Merge fix-charm-offiline-paths-for-14.10 [f=1411444,1411446] [r=adam-col...
- David Britton 2015-01-15 [merge] Merge strip-url-newline-1411353 [f=1411353] [r=ahasenack,adam-collard] [a...
- Free Ekanayaka 2015-01-12 [merge] Merge offline-assets-charm [f=1409670] [r=tealeg,ack] [a=Free Ekanayaka]

216. By David Britton on 2015-01-15

Merge strip-url-newline-stable-1411353 [f=1411353] [r=ahasenack,adam-collard] [a=David Britton]

215. By Andreas Hasenack on 2015-01-07

Fix how the test script is called. [r=dpb] [trivial]

214. By David Britton on 2015-01-06

Merge update-tests-fix [f=1399314] [r=adam-collard,bjornt] [a=David Britton]
Fix make lint, test, integration-test & charm-proof

213. By David Britton on 2015-01-06

Merge tests-process-profiles-1404008 [f=1404008] [r=bjornt,benji] [a=David Britton]
Tests look for process_profiles or landscape_profiles for cron script name

212. By Andreas Hasenack on 2014-10-21

Merge relation-with-no-units [f=1383272] [r=jjo,adam-collard] [a=Andreas Hasenack]
Handle the case where the relation with haproxy is established, but there are no units in it yet.

211. By Andreas Hasenack on 2014-10-17

Disable SSLv3 and v2 on the quickstart vhost to avoid the POODLE attack [r=tribaal] [trivial]

210. By Andreas Hasenack on 2014-10-16

Merge service-names-1379133 [f=1379133] [r=chad.smith,benji] [a=Andreas Hasenack]
Update the haproxy jinja variables in the apache vhost template files according to whatever service name haproxy was deployed as.