lp://staging/~adam-collard/landscape-charm/fix-landscape-readme

Branch merges

Propose for merging

No branches dependent on this one.

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

Alberto Donato: Approve on 2015-04-09

David Britton (community): Approve on 2015-04-08

🤖 Landscape Builder: Approve (test results) on 2015-04-08

Diff: 101 lines (+30/-23)

1 file modified

README.md (+30/-23)

api

Superseded for merging into lp://staging/~landscape/landscape-charm/trunk

Landscape: Pending requested 2015-04-08

Landscape: Pending requested 2015-04-08

Diff: 154 lines (+77/-4) (has conflicts)

2 files modified

README.md (+75/-2)
old/hooks/install (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

225. By Adam Collard on 2015-04-09

Incorporate formatting suggestions from dpb and ack

224. By Adam Collard on 2015-04-08

Update README

223. By David Britton on 2015-03-23

Merge update-readme. [r=fcorrea,dpb] [f=1434732] [a=Dean Henrichsmeyer]
Updated the README to reflect current bundle choices and the recommended way of
deploying Landscape Dedicated Server (LDS)

222. By David Britton on 2015-03-20

- Use hkp:// keyserver urls, as they work behind an http_proxy [r=free] [trivial]

221. By David Britton on 2015-03-19

Merge stable-use-existing-server [f=] [r=bjornt,adam-collard,landscape-builder] [a=David Britton]
Don't fail the tests if a user is added to the deployment.

220. By David Britton on 2015-03-04

Merge stable-use-local-branch [f=] [r=fcorrea,adam-collard,landscape-builder] [a=David Britton]
Integration tests now test the current branch, not the charm store.

219. By David Britton on 2015-02-26

Merge stable-use-external-bundles [f=] [r=adam-collard,bjornt,landscape-builder] [a=David Britton]
Branch bundles from lp:landscape-charm/bundles-trunk.

218. By Free Ekanayaka on 2015-02-05

Merge no-combo-loader-support [f=1417971] [r=danilo,tealeg] [a=Free Ekanayaka]
Support both LDS packages with and and 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]