Merge lp://staging/~codyshepherd/livecd-rootfs/ubuntu-core-dev-snaps-manifest into lp://staging/~ubuntu-core-dev/livecd-rootfs/cosmic-proposed

Proposed by Cody Shepherd
Status: Merged
Merged at revision: 1708
Proposed branch: lp://staging/~codyshepherd/livecd-rootfs/ubuntu-core-dev-snaps-manifest
Merge into: lp://staging/~ubuntu-core-dev/livecd-rootfs/cosmic-proposed
Diff against target: 116 lines (+39/-20)
4 files modified
debian/changelog (+7/-0)
live-build/auto/build (+1/-1)
live-build/functions (+1/-1)
live-build/snap-seed-parse.py (+30/-18)
To merge this branch: bzr merge lp://staging/~codyshepherd/livecd-rootfs/ubuntu-core-dev-snaps-manifest
Reviewer Review Type Date Requested Status
Steve Langasek Approve
Review via email: mp+358726@code.staging.launchpad.net

Commit message

Changes to include snaps in manifest.

Description of the change

Changes to include snaps in manifest.

To post a comment you must log in.
1709. By Cody Shepherd

Fixing version number in changelog.

Revision history for this message
Steve Langasek (vorlon) wrote :

How are you creating debian/changelog? You should be using the 'dch' command, and you should set 'DEBCHANGE_RELEASE_HEURISTIC=changelog' in ~/.devscripts.

Also in this case this is an incremental change to the feature which has not yet landed in the archive, so I think an additional changelog entry is not needed at all.

Fixing up as part of the merge.

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