~snappy-dev/snapd/+git/snapd-pawel:fix-self-conflict

Last commit made on 2018-09-13
Get this branch:
git clone -b fix-self-conflict https://git.launchpad.net/~snappy-dev/snapd/+git/snapd-pawel

Branch merges

Branch information

Name:
fix-self-conflict
Repository:
lp:~snappy-dev/snapd/+git/snapd-pawel

Recent commits

3cbdd20... by Paweł Stołowski

Merge branch 'master' into fix-self-conflict

31616d9... by Michael Vogt

Merge pull request #5828 from mvo5/lxd-fix-maybe

snap-confine: make /lib/modules optional

0aa803f... by Michael Vogt

snap-confine: make /lib/modules optional

0c6f372... by Paweł Stołowski

obsoleteCorePhase2SetupProfiles helper (thanks mvo).

5d156d4... by Paweł Stołowski

Fix the comment.

31b17fa... by Paweł Stołowski

Merge pull request #5818 from zyga/fix/snap-interfaces-core

cmd/snap: handle "snap interfaces core" better

56e4341... by Paweł Stołowski

Merge pull request #5765 from mvo5/store-tests-refactor

store: move download tests into downloadSuite

93d05e8... by Michael Vogt

add missing xdelta3 mock

d07d904... by Zygmunt Krynicki

Merge pull request #5785 from mvo5/core18-account-control-on-uc18

tests,interfaces: run interfaces-account-control on UC18

4e0e62f... by Zygmunt Krynicki

Merge pull request #5806 from sergiocazzolato/tests-fix-install-classic

tests: fix install snaps test by adding link to /snap