lp:snappy/15.04

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~snappy-dev/snappy/snappy-moved-to-github at revision 711

John Lenton (community): Approve on 2015-09-23

Diff: 152 lines (+68/-48)

3 files modified

coreconfig/config.go (+12/-3)
coreconfig/config_test.go (+12/-0)
docs/oem.md (+44/-45)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

717. By Michael Vogt on 2015-10-22

merged lp:snappy

716. By Michael Vogt on 2015-10-22

merged lp:snappy

Merged branch lp:~snappy-dev/snappy/snappy-moved-to-github

715. By Michael Vogt on 2015-10-13

empty commit to allow source recipe build

714. By John Lenton on 2015-10-13

Merge trunk fixes. by snappy-dev approved by chipaca

Merged branch lp:~snappy-dev/snappy/snappy-moved-to-github

713. By Michael Vogt on 2015-09-29

merged lp:snappy

712. By Michael Vogt on 2015-09-23

All the latest trunk, freshly merged just for you. by chipaca approved by elopio

Merged branch lp:~chipaca/snappy/trunk-to-15.04

711. By Michael Vogt on 2015-09-23

merged lp:snappy

710. By Federico Gimenez on 2015-09-22

Avoid a panic when coreconfig is given invalid config. by chipaca approved by mvo

Merged branch lp:~chipaca/snappy/dont-panic

709. By David Callé on 2015-09-18

Markdown fix in docs/oem.md by davidc3 approved by mvo

Merged branch lp:~davidc3/snappy/oem-docs-formatting

708. By Federico Gimenez on 2015-09-17

Extended ssh timeout by fgimenez approved by elopio