summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/nmcli-editor-secrets-fix' into dcbw/nm-1-0-integration-20141118dcbw/nm-1-0-integration-20141118Dan Williams2014-11-181-7/+15
|\
| * cli: fix showing secrets in nmcli editorJiří Klimeš2014-11-181-7/+15
|/
* Merge branch 'jk/ignore-timestamp' into dcbw/nm-1-0-integration-20141118Dan Williams2014-11-185-17/+55
|\
| * cli: ignore timestamp when comparing connections in the editorJiří Klimeš2014-11-181-1/+1
| * libnm-core: add NM_SETTING_COMPARE_FLAG_IGNORE_TIMESTAMP flagJiří Klimeš2014-11-184-0/+38
| * libnm-core: (trivial) indent NMSettingCompareFlags description for readibilityJiří Klimeš2014-11-181-16/+16
|/
* Merge branch 'danw/setting-docs-bgo740224' into dcbw/nm-1-0-integration-20141118Dan Williams2014-11-1849-1439/+1533
|\
| * man, docs: add the secret flags notes non-hackishlyDan Winship2014-11-185-3/+9
| * cli, libnm: don't use D-Bus-specific documentation in nmcliDan Winship2014-11-184-3/+16
| * libnm: Override parts of nm-setting-docs.xmlDan Winship2014-11-1812-15/+207
| * libnm: fix nm-setting-docs.xml property typesDan Winship2014-11-184-20/+62
| * libnm-core: make GBytes D-Bus marshalling be built-in to NMSettingDan Winship2014-11-184-36/+4
| * libnm, libnm-util: move settings doc generation to libnm-coreDan Winship2014-11-1842-1369/+1242
|/
* Merge branch 'danw/dhcp-internal-bgo740277' into dcbw/nm-1-0-integration-2014...Dan Williams2014-11-1822-370/+462
|\
| * man: document the "internal" DHCP clientDan Winship2014-11-181-6/+12
| * dhcp-manager: Simplify nm-dhcp-systemd lease-handling codeDan Winship2014-11-181-25/+13
| * dhcp: fix startup warnings with dhcp=internalDan Winship2014-11-181-1/+1
| * dhcp: fix systemd-dhcp's writing of routes in lease fileDan Winship2014-11-181-3/+5
| * dhcp: update nm-dhcp-systemd code for system-dhcp re-importDan Winship2014-11-181-2/+2
| * dhcp: re-fix system-dhcp code after re-importDan Winship2014-11-184-2/+12
| * Merge branch 'master' into dhcp-mergeDan Winship2014-11-18488-12800/+18266
| |\
| * | dhcp: update systemd DHCP codeDan Winship2014-11-1818-360/+446
* | | Merge branch 'th/rh1098281_firewall_assumed_device' into dcbw/nm-1-0-integrat...Dan Williams2014-11-185-56/+156
|\ \ \
| * | | fixup! firewall: don't set firewall zone for assumed devicesThomas Haller2014-11-181-19/+2
| * | | firewall: don't set firewall zone for assumed devicesThomas Haller2014-11-182-3/+32
| * | | fixup! firewall: always complete callbacks asynchronouslyDan Williams2014-11-181-12/+6
| * | | fixup! firewall: always complete callbacks asynchronouslyThomas Haller2014-11-181-7/+14
| * | | firewall: always complete callbacks asynchronouslyThomas Haller2014-11-181-31/+98
| * | | firewall: invoke FwAddToZoneFunc callback also when cancellingThomas Haller2014-11-182-4/+20
| * | | firewall: make call handle an opaque pointer typeThomas Haller2014-11-183-33/+36
| * | | firewall: allow passing NULL callback to nm_firewall_manager_add_or_change_zo...Thomas Haller2014-11-181-2/+4
| * | | core: move content of src/firewall-manager directory to src/Thomas Haller2014-11-183-3/+2
|/ / /
* | | Merge branch 'th/bgo735512_route_metric_v2' into dcbw/nm-1-0-integration-2014...Dan Williams2014-11-186-184/+604
|\ \ \
| * | | policy: fix handling managed devices without default routeThomas Haller2014-11-182-41/+102
| * | | policy: sort default routes by metrics before adding themThomas Haller2014-11-181-12/+31
| * | | policy: pick up externally configured default routes for managed interfacesThomas Haller2014-11-183-19/+38
| * | | fixup! policy: resync routes on platform change eventsThomas Haller2014-11-181-5/+5
| * | | fixup! policy: resync routes on platform change eventsThomas Haller2014-11-181-5/+5
| * | | fixup! policy: resync routes on platform change eventsThomas Haller2014-11-181-2/+8
| * | | policy: resync routes on platform change eventsThomas Haller2014-11-181-12/+235
| * | | fixup! policy: consider additional assumed routes when synchronizing the defa...Thomas Haller2014-11-181-9/+11
| * | | policy: consider additional assumed routes when synchronizing the default routeThomas Haller2014-11-181-5/+96
| * | | policy: minor refactoring in NMDefaultRouteManager to access routes genericallyThomas Haller2014-11-181-8/+14
| * | | fixup! device: only add default route when having any addressesThomas Haller2014-11-181-3/+11
| * | | fixup! device: only add default route when having any addressesThomas Haller2014-11-181-11/+3
| * | | fixup! device: only add default route when having any addressesThomas Haller2014-11-181-4/+4
| * | | device: only add default route when having any addressesThomas Haller2014-11-181-3/+21
| * | | policy: remove redundant remove_default_route() functions from NMDefaultRoute...Thomas Haller2014-11-184-41/+4
| * | | policy: remove unused @do_sync argument from NMDefaultRouteManager functionsThomas Haller2014-11-181-16/+14
| * | | policy: minor fix when having multiple default routes with metric MAXUINT32Thomas Haller2014-11-181-1/+2
View Lorry Controller Status