summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch master of git://anongit.freedesktop.org/NetworkManager/NetworkMa...th/mifThomas Haller2016-03-2944-712/+1321
|\
| * policy: merge branch 'th/policy-cleanup'Thomas Haller2016-03-292-295/+335
| |\
| | * policy: use slice allocator for ActivateDataThomas Haller2016-03-291-2/+3
| | * policy: use slice allocator for PendingSecondaryDataThomas Haller2016-03-291-3/+2
| | * policy/trival: rename "policy" argument to "self"Thomas Haller2016-03-291-198/+199
| | * policy: remove initialized guard from nm_policy_new()Thomas Haller2016-03-291-11/+5
| | * policy: initialize object during GObject constructionThomas Haller2016-03-292-25/+71
| | * policy: refactor object properties to notify by property enumThomas Haller2016-03-291-35/+30
| | * policy/trivial: move codeThomas Haller2016-03-291-55/+59
| |/
| * all: merge branch 'th/invalid-connections-bgo760907'Thomas Haller2016-03-2942-414/+969
| |\
| | * libnm-glib: allow non-verifiable NMRemoteConnection in libnm-glibThomas Haller2016-03-292-43/+20
| | * libnm-glib: don't fail creating connection in NMVPNPluginThomas Haller2016-03-291-28/+4
| | * libnm-glib: don't fail creating connection in NMSecretAgentThomas Haller2016-03-291-15/+7
| | * libnm-util: add non-failing versions of nm_connection_new_from_hash() and rep...Thomas Haller2016-03-293-9/+49
| | * libnm-util: refactor hash_to_connection()Thomas Haller2016-03-291-14/+11
| | * libnm-util: don't print any warnings during nm_setting_new_from_hash()Thomas Haller2016-03-291-15/+3
| | * libnm-util: use "nm-shared-utils.h"Thomas Haller2016-03-291-0/+2
| | * libnm: add code comments to hint that NMConnection might not validateThomas Haller2016-03-292-0/+18
| | * core: be strict about connection argument in D-Bus methodsThomas Haller2016-03-292-2/+4
| | * core: be strict when parsing connection in AddAndActivateConnectionThomas Haller2016-03-291-1/+1
| | * core: be strict about connection argument for Reapply() D-Bus methodThomas Haller2016-03-261-1/+4
| | * libnm: be more accepting for invalid connections from NetworkManagerThomas Haller2016-03-262-10/+5
| | * libnm: accept invalid connections in NMVpnServicePluginThomas Haller2016-03-262-6/+6
| | * libnm: accept invalid connections in NMSecretAgentOldThomas Haller2016-03-261-1/+2
| | * libnm: don't normalize connection for nm_device_get_applied_connection()Thomas Haller2016-03-261-2/+2
| | * libnm-core/tests: refactor call to nm_simple_connection_new_from_dbus()Thomas Haller2016-03-261-21/+27
| | * libnm-core: add _nm_simple_connection_new_from_dbus() functionThomas Haller2016-03-265-10/+56
| | * libnm-core: allow strict and relaxed error behavior for _nm_setting_new_from_...Thomas Haller2016-03-2610-74/+285
| | * shared: add nm_g_object_set_property()Thomas Haller2016-03-263-0/+100
| | * libnm/tests: extend tests for handling invalid connections in NMClientThomas Haller2016-03-261-36/+143
| | * shared: move NM_UTILS_ERROR to shared-utilsThomas Haller2016-03-264-58/+58
| | * shared: move _nm_utils_ascii_str_to_int64() to "shared/nm-shared-utils.h"Thomas Haller2016-03-264-77/+82
| | * shared: include "nm-shared-utils.h"Thomas Haller2016-03-262-0/+3
| | * shared: add "nm-shared-utils"Thomas Haller2016-03-263-0/+54
| | * shared: add nm_auto_unset_gvalue macroThomas Haller2016-03-261-0/+7
| | * nmtst: add nmtst_variant_new_vardict() functionThomas Haller2016-03-261-0/+21
| | * nmtst: fix memleak when using NMTST_VARIANT_DROP_SETTING()Thomas Haller2016-03-261-0/+2
| | * libnm-util: verify connection also for self-assignment in replace_settings_fr...Thomas Haller2016-03-261-2/+4
| |/
* | netns: refactor NMNetnsThomas Haller2016-03-2922-996/+601
* | rdisc: drop NMNetns from NMRDiscThomas Haller2016-03-264-23/+2
* | platform: don't use NMNetns in NMPlatformThomas Haller2016-03-263-5/+0
* | Merge branch master of git://anongit.freedesktop.org/NetworkManager/NetworkMa...Thomas Haller2016-03-26231-9076/+12763
|\ \ | |/
| * merge: branch 'lr/virtual-parent-bgo762731'Lubomir Rintel2016-03-265-85/+240
| |\
| | * manager: allow delaying the device activation when the parent is not reallr/virtual-parent-bgo762731Lubomir Rintel2016-03-261-5/+70
| | * manager: separate the traversal to disconected to a separate routineLubomir Rintel2016-03-261-22/+33
| | * active-connection: add parent active connection trackingLubomir Rintel2016-03-262-0/+84
| | * device: delay the activation if the backing device is not yet thereLubomir Rintel2016-03-261-1/+1
| | * device: only clear the activate request when the device disconnectsLubomir Rintel2016-03-261-1/+2
| | * device: _get_available_connections() with _get_best_connection()Lubomir Rintel2016-03-263-58/+52
| |/
| * merge: branch 'lr/developer-gnome'Lubomir Rintel2016-03-2648-2670/+1421
| |\