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 |
Related bugs: |
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-
instead of
ubuntu-
which looks a bit less organized.
To post a comment you must log in.
Attempt to merge into lp:snappy/15.04 failed due to conflicts:
text conflict in coreconfig/ config. go