Merge lp://qastaging/~chipaca/snappy/dont-panic into lp://qastaging/snappy/15.04
Proposed by
John Lenton
| Status: | Merged |
|---|---|
| Approved by: | Michael Vogt |
| Approved revision: | 712 |
| Merged at revision: | 710 |
| Proposed branch: | lp://qastaging/~chipaca/snappy/dont-panic |
| Merge into: | lp://qastaging/snappy/15.04 |
| Diff against target: |
324 lines (+249/-4) 7 files modified
_integration-tests/testutils/image/image.go (+1/-1) cmd/snappy/cmd_console.go (+165/-0) cmd/snappy/cmd_console_test.go (+57/-0) coreconfig/config.go (+12/-3) coreconfig/config_test.go (+12/-0) debian/control (+1/-0) dependencies.tsv (+1/-0) |
| To merge this branch: | bzr merge lp://qastaging/~chipaca/snappy/dont-panic |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Vogt (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2015-09-21.
Commit message
Avoid a panic when coreconfig is given invalid config.
To post a comment you must log in.
Revision history for this message
| Michael Vogt (mvo) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks!