Merge lp://qastaging/~mvo/snap-confine/new-additional-yaml into lp://qastaging/~snappy-dev/snap-confine/trunk

Proposed by Michael Vogt
Status: Rejected
Rejected by: Michael Vogt
Proposed branch: lp://qastaging/~mvo/snap-confine/new-additional-yaml
Merge into: lp://qastaging/~snappy-dev/snap-confine/trunk
Diff against target: 121 lines (+54/-27)
2 files modified
debian/changelog (+7/-0)
src/main.c (+47/-27)
To merge this branch: bzr merge lp://qastaging/~mvo/snap-confine/new-additional-yaml
Reviewer Review Type Date Requested Status
Snappy Developers Pending
Review via email: mp+277215@code.qastaging.launchpad.net

Description of the change

Small branch that adds support for the new /var/lib/snappy/apparmor/additional directory that the new snappy with the build-in policy generator will use.

To post a comment you must log in.
83. By Michael Vogt

merge lp:ubuntu-core-launcher and resolve conflicts

Unmerged revisions

83. By Michael Vogt

merge lp:ubuntu-core-launcher and resolve conflicts

82. By Michael Vogt

add support for the new /var/lib/snappy/apparmor/additional/
yaml overrides location

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