~alfonsosanchezbeato/snappy-hwe-snaps/+git/network-manager:fix-lp1675656

Branch merges

Propose for merging

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

Matteo Croce (community): Approve on 2017-03-27

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

Simon Fels: Approve on 2017-03-27

Diff: 12 lines (+0/-1)

1 file modified

src/dhcp-manager/nm-dhcp-client.c (+0/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

002e5a8... by Alfonso Sanchez-Beato on 2017-03-27

Remove assertion for empty DHCP6 options

It turns out that some routers return responses to Information-request
messages that do not contain any of the options that we insert in the
"options" table. When that happened and the info-only flag for DHCP6
was set, the assertion was triggered and NetworkManager crashed. We
remove the assertion as having empty options is a possibility and is
harmless anyway.

58031e0... by System Enablement CI Bot <email address hidden> on 2017-03-17

Merge remote tracking branch network-manager/xenial/1.2.2

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

fe2cb4a... by System Enablement CI Bot <email address hidden> on 2017-03-16

Merge remote tracking branch f/dnsmasq-support

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

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

Place the runtime directory inside our snap space

e3d32a5... by System Enablement CI Bot <email address hidden> on 2017-03-09

Merge remote tracking branch b/consistent-config-item-names

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

250b7f3... by Matteo Croce on 2017-03-08

don't shutdown interfaces if they have wo(w)lan enabled

459c008... by Simon Fels on 2017-03-09

wifi: be consistent with configuration item naming and use wifi prefix

b679073... by System Enablement CI Bot <email address hidden> on 2017-03-07

Merge remote tracking branch remove-more-tests

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

0f688f7... by Alfonso Sanchez-Beato on 2017-03-06

Remove lldp tests from Makefile.am

This tests do not work in the CI environment.

7176580... by System Enablement CI Bot <email address hidden> on 2017-03-06

Merge remote tracking branch remove-link-test

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