summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* vpn: fix creating config for non-tunnel based VPN connectionsth/vpn-route-bgo752225Thomas Haller2015-07-131-7/+12
* vpn: fix allow overwriting default gateway by connection configurationThomas Haller2015-07-132-3/+6
* vpn: fix overwriting gateway of parent device for non-tunnel based VPNsThomas Haller2015-07-131-2/+9
* vpn: don't set the gateway of VPN's IP config to the external gatewayThomas Haller2015-07-131-4/+0
* default-route-manager: fix handling for absent default routes for VPNThomas Haller2015-07-131-1/+7
* default-route-manager: don't add entries with (!synced && never_default)Thomas Haller2015-07-131-0/+7
* cli: fix usage output for `nmcli connection add` removing duplicate "save"Thomas Haller2015-07-131-1/+0
* merge: branch 'lr/cli-add-master'Lubomir Rintel2015-07-124-243/+285
|\
| * cli: add "nmcli c add master" to bash-completionlr/cli-add-masterLubomir Rintel2015-07-121-22/+4
| * cli: add master option to "nmcli c add"Lubomir Rintel2015-07-123-22/+63
| * cli: discover slave type for a connection with a masterLubomir Rintel2015-07-121-11/+33
| * cli: remove an extraneous _strip_master_prefix() callLubomir Rintel2015-07-121-1/+1
| * cli: process slave parameters after the rest of the settings are set upLubomir Rintel2015-07-121-193/+190
|/
* merge branch 'th/misc-bgo752087'Thomas Haller2015-07-1245-396/+480
|\
| * core: print connection path in nm_utils_log_connection_diff()Thomas Haller2015-07-121-4/+8
| * settings: use _LOG() macros in "nm-settings-connection.c"Thomas Haller2015-07-121-68/+72
| * libnm-core: don't assert in nm_connection_get_uuid() for valid connectionThomas Haller2015-07-121-1/+2
| * settings: add _LOG() macros to "nm-settings-connection.h"Thomas Haller2015-07-121-0/+42
| * settings/trivial: consistently name @self argument in NMSettingsConnectionThomas Haller2015-07-122-159/+159
| * settings: refactor logging statement in nm_settings_connection_get_secrets()Thomas Haller2015-07-121-12/+8
| * platform: assert for valid ifname in ethtool_get()Thomas Haller2015-07-121-1/+4
| * all: remove #if GLIB_CHECK_VERSION conditionals around g_type_init()Thomas Haller2015-07-1224-56/+34
| * core: add glib compatibility wrapper nm_g_type_init() for g_type_init()Thomas Haller2015-07-121-0/+11
| * iface-helper: remove redundant g_type_init() callThomas Haller2015-07-121-4/+0
| * test: initialize tests with nmtst_init()Thomas Haller2015-07-1213-77/+62
| * platform: fix wrapper nm_platform_addr_flags2str() for rtnl_addr_flags2str()Thomas Haller2015-07-122-14/+66
| * platform: don't allocate string for flags in nm_platform_ip6_address_to_string()Thomas Haller2015-07-121-6/+7
| * nmtst: add function nmtst_assert_str_has_substr()Thomas Haller2015-07-121-0/+11
|/
* clients: fix bad array loop in nm-secret-agent-simple.c:strv_has (bgo #752137)Jiří Klimeš2015-07-101-3/+3
* po: update Polish (pl) translation (bgo #751998)Piotr Drąg2015-07-101-900/+1147
* device: fix regression for ignored search domains in ip._config_merge_and_app...Thomas Haller2015-07-091-2/+4
* contrib/rpm: always drag in bluez-libs-develLubomir Rintel2015-07-091-5/+1
* bluetooth: avoid an assertion failure if built w/o bluez5 supportLubomir Rintel2015-07-091-3/+6
* systemd: fix compiler warning about uninitialized variableThomas Haller2015-07-091-1/+1
* systemd: merge branch 'systemd'Beniamino Galvani2015-07-0839-2771/+1884
|\
| * systemd: update code from upstreamBeniamino Galvani2015-07-0537-2727/+1817
* | supplicant: allow with_system_ca_path to be a file name (rh #1236548)Jiří Klimeš2015-07-083-28/+49
* | utils: fix error logging in ASSERT_VALID_PATH_COMPONENT()Jiří Klimeš2015-07-081-5/+4
* | device: use NULL instead of 0 in g_return_val_if_fail() for pointerJiří Klimeš2015-07-081-1/+1
* | device: trivial: fix a copy/paste error in commentJiří Klimeš2015-07-081-1/+1
* | examples: add python+dbus example to print active access pointDan Williams2015-07-082-1/+68
* | route-manager: restore shadowed gateway routes after direct routesThomas Haller2015-07-081-1/+27
* | device: just get ip_iface in the place where it is neededJiří Klimeš2015-07-071-2/+2
* | route-manager/trivial: move codeThomas Haller2015-07-071-12/+12
* | settings: get_plugin() should return plugin that has all requested capabilitiesThomas Haller2015-07-071-1/+1
* | route-manager: merge branch 'th/direct-route-conflict-bgo752062'Thomas Haller2015-07-074-58/+387
|\ \
| * | route-manager: always add conflicting direct routes and bump the route-metric...Thomas Haller2015-07-072-48/+340
| * | route-manager: add optional @r2_metric argument to _route_equals_ignoring_ifi...Thomas Haller2015-07-071-4/+7
| * | platform: add optional @metric argument to route_add() functionThomas Haller2015-07-073-7/+7
| * | route-manager: add compare function for route-destinationThomas Haller2015-07-071-1/+35