diff options
author | Jiří Klimeš <jklimes@redhat.com> | 2015-06-19 12:15:12 +0200 |
---|---|---|
committer | Jiří Klimeš <jklimes@redhat.com> | 2015-06-19 12:15:12 +0200 |
commit | 2f51ba50df8341370ab1f480f9ec6d60cd32ece2 (patch) | |
tree | 29a4eafb9d781f5ed96821e860872971621abef8 /Makefile.am | |
parent | 517e9fa0f062e286f893f41770d0562c4baf0c51 (diff) | |
parent | 1468f4edd2b57e5a76c11df2e397d050b0613d82 (diff) |
merge branch 'th/connection-defaults-bgo695383'
- support new [connection] section in NetworkManager.conf
- allow configuring a default value for ipvx.route-metric
- allow configuring a default value for ipv6.ip6-privacy
and read the fallback configuration from sysctl.
https://bugzilla.gnome.org/show_bug.cgi?id=695383
https://bugzilla.gnome.org/show_bug.cgi?id=721200
https://bugzilla.redhat.com/show_bug.cgi?id=1187525
(cherry-picked from commit 18ecf48d7a9d03194db1b65ef46e386284426f89)
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions