~morphis/snappy-hwe-snaps/+git/network-manager:f/dnsmasq-support

Branch merges

Propose for merging

Merged into ~snappy-hwe-team/snappy-hwe-snaps/+git/network-manager:network-manager/xenial/1.2.2 at revision fe2cb4a09742b1ff54b43baed8ea77c5f397c4d4

System Enablement Bot: Approve (continuous-integration) on 2017-03-16

Alfonso Sanchez-Beato: Approve on 2017-03-16

Diff: 13 lines (+1/-1)

1 file modified

src/dnsmasq-manager/nm-dnsmasq-manager.c (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

82928cd... by Simon Fels on 2017-03-16

Place the runtime directory inside our snap space

86a4242... by System Enablement CI Bot <email address hidden> on 2016-11-07

Merge remote tracking branch nm-revert-dhcp-lease-storage

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

c8f24a0... by System Enablement CI Bot <email address hidden> on 2016-11-07

Merge remote tracking branch xenial/1.2.3/fix-cast-crash

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

2fefbe0... by Beniamino Galvani <email address hidden> on 2016-10-26

wwan: fix wrong connection cast on device state change

nm_settings_connection_set_autoconnect_blocked_reason() must be called
on the settings-connection. Fixes the following:

GLib-GObject-WARNING **: invalid cast from 'NMSimpleConnection' to 'NMSettingsConnection'

Fixes: 06da3532428e3498c1e808ff8be1af48b540a6ff

45a67e2... by Simon Fels on 2016-11-02

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

9dbee76... by Simon Fels on 2016-11-02

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

This reverts commit 2331dd5f46178b6bb6d0ea3bf8cfb953feeb74d3.

1edfb12... by Simon Fels on 2016-11-02

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

This reverts commit 275d12ba0f70753f3258dda8298609ef95974cff.

75d0274... by System Enablement CI Bot <email address hidden> on 2016-10-20

Merge remote tracking branch fix-state-dir-output

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

30b2b99... by Simon Fels on 2016-10-20

[SNAPPY] Print out correct path for the secret key

292a213... by System Enablement CI Bot <email address hidden> on 2016-10-07

Merge remote tracking branch fix-secret-path

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