~morphis/snappy-hwe-snaps/+git/network-manager:nm-revert-dhcp-lease-storage

Last commit made on 2016-11-02
Get this branch:
git clone -b nm-revert-dhcp-lease-storage https://git.launchpad.net/~morphis/snappy-hwe-snaps/+git/network-manager
Only Simon Fels can upload to this branch. If you are Simon Fels please log in for upload directions.

Branch merges

Branch information

Name:
nm-revert-dhcp-lease-storage
Repository:
lp:~morphis/snappy-hwe-snaps/+git/network-manager

Recent commits

45a67e2... by Simon Fels

[SNAPPY] Move dhcp lease into a subdirectory of our state dir

9dbee76... by Simon Fels

Revert "[SNAPPY] Write DHCP lease files to /run/NetworkManager/dhcp/"

This reverts commit 2331dd5f46178b6bb6d0ea3bf8cfb953feeb74d3.

1edfb12... by Simon Fels

Revert "Add a comment explaining why we're setting the lease file directory"

This reverts commit 275d12ba0f70753f3258dda8298609ef95974cff.

3d64af5... by Simon Fels

[SNAPPY] Set correct path for secret_key on write attempt too

98b73a2... by System Enablement CI Bot <email address hidden>

Merge remote tracking branch dhcp-leases-run

Merge-Proposal: https://code.launchpad.net/~ssweeny/snappy-hwe-snaps/+git/network-manager/+merge/307371

275d12b... by Scott Sweeny

Add a comment explaining why we're setting the lease file directory

2331dd5... by Scott Sweeny

[SNAPPY] Write DHCP lease files to /run/NetworkManager/dhcp/

25a2614... by System Enablement CI Bot <email address hidden>

Merge remote tracking branch xenial-add-netplan-support

Merge-Proposal: https://code.launchpad.net/~morphis/snappy-hwe-snaps/+git/network-manager/+merge/306487

b91fb1f... by System Enablement CI Bot <email address hidden>

Merge remote tracking branch fix-secret-key-name

Merge-Proposal: https://code.launchpad.net/~awe/snappy-hwe-snaps/+git/network-manager/+merge/306922

3b6273f... by Martin Pitt

[SNAPPY] Add support for reading netplan's connection files

Origin: https://git.launchpad.net/network-manager/tree/debian/patches/Read-system-connections-from-run.patch
Bug-Ubuntu: https://launchpad.net/bugs/1594551