Snappy

Merge lp://staging/snappy/15.04 into lp://staging/~snappy-dev/snappy/snappy-moved-to-github

  1. 15.04
  2. Merge into snappy-moved-to-github
Proposed by Michael Vogt
Status: Merged
Merged at revision: 711
Proposed branch: lp://staging/snappy/15.04
Merge into: lp://staging/~snappy-dev/snappy/snappy-moved-to-github
Diff against target: 152 lines (+68/-48)
3 files modified
coreconfig/config.go (+12/-3)
coreconfig/config_test.go (+12/-0)
docs/oem.md (+44/-45)
To merge this branch: bzr merge lp://staging/snappy/15.04
Reviewer Review Type Date Requested Status
John Lenton (community) Approve
Review via email: mp+271625@code.staging.launchpad.net

Description of the change

Merge fixes from 15.04 back into trunk.

To post a comment you must log in.
lp://staging/snappy/15.04 updated
709. By David Callé

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

710. By Federico Gimenez

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

711. By Michael Vogt

merged lp:snappy

Revision history for this message
John Lenton (chipaca) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches