Merge lp://qastaging/~mvo/snappy/15.04-config-cleanup into lp://qastaging/~snappy-dev/snappy/15.04-deprecated

Proposed by Michael Vogt
Status: Merged
Approved by: Michael Vogt
Approved revision: 475
Merged at revision: 479
Proposed branch: lp://qastaging/~mvo/snappy/15.04-config-cleanup
Merge into: lp://qastaging/~snappy-dev/snappy/15.04-deprecated
Prerequisite: lp://qastaging/~mvo/snappy/15.04-fix-off-by-one
Diff against target: 237 lines (+51/-46)
2 files modified
coreconfig/config.go (+34/-29)
coreconfig/config_test.go (+17/-17)
To merge this branch: bzr merge lp://qastaging/~mvo/snappy/15.04-config-cleanup
Reviewer Review Type Date Requested Status
Michael Vogt (community) Approve
Sergio Schvezov Approve
Review via email: mp+270629@code.qastaging.launchpad.net

Commit message

reorganizes the ubuntu-core network config

Description of the change

This branch reorganizes the ubuntu-core network config so that there is:
 ubuntu-core.network.{interfaces,ppp}
instead of
 ubuntu-core.{ppp,network}
which looks a bit less organized.

To post a comment you must log in.
Revision history for this message
Sergio Schvezov (sergiusens) :
review: Approve
Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :

Attempt to merge into lp:snappy/15.04 failed due to conflicts:

text conflict in coreconfig/config.go

Revision history for this message
Sergio Schvezov (sergiusens) wrote :

ah, this didn't get the pump for the var string change

Revision history for this message
Michael Vogt (mvo) :
review: Approve
Revision history for this message
Snappy Tarmac (snappydevtarmac) wrote :

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

Revision history for this message
Michael Vogt (mvo) :
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