From c6e1b3abc03d686441869c184206780e43a1c13b Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: Fri, 12 Jan 2018 14:05:24 +0100 Subject: [PATCH 1/2] libnm-core: update team.runner description https://bugzilla.redhat.com/show_bug.cgi?id=1533799 (cherry picked from commit 112f8bd5aff2c5d543699d968f56c7f98be07eec) --- libnm-core/nm-setting-team.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index 88008e422..01b22d9bd 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -1656,6 +1656,10 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class) * Corresponds to the teamd runner.name. * Permitted values are: "roundrobin", "broadcast", "activebackup", * "loadbalance", "lacp". + * When setting the runner, all the properties specific to the runner + * will be reset to the default value; all the properties specific to + * other runners will be set to an empty value (or if not possible to + * a default value). * * Since: 1.10.2 **/ -- 2.14.3 From bcababf6126650e9d9bea7d2c48582f435c287c2 Mon Sep 17 00:00:00 2001 From: Francesco Giudici Date: Fri, 12 Jan 2018 15:20:23 +0100 Subject: [PATCH 2/2] libnm-core: docs update requires also settings-docs.c.in update Fixes: c6e1b3abc03d686441869c184206780e43a1c13b --- clients/common/settings-docs.c.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clients/common/settings-docs.c.in b/clients/common/settings-docs.c.in index bf544ab6e..bf5753c57 100644 --- a/clients/common/settings-docs.c.in +++ b/clients/common/settings-docs.c.in @@ -325,7 +325,7 @@ #define DESCRIBE_DOC_NM_SETTING_TEAM_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_COUNT N_("Corresponds to the teamd notify_peers.count.") #define DESCRIBE_DOC_NM_SETTING_TEAM_NOTIFY_PEERS_INTERVAL N_("Corresponds to the teamd notify_peers.interval.") -#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\".") +#define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER N_("Corresponds to the teamd runner.name. Permitted values are: \"roundrobin\", \"broadcast\", \"activebackup\", \"loadbalance\", \"lacp\". When setting the runner, all the properties specific to the runner will be reset to the default value; all the properties specific to other runners will be set to an empty value (or if not possible to a default value).") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_ACTIVE N_("Corresponds to the teamd runner.active.") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_AGG_SELECT_POLICY N_("Corresponds to the teamd runner.agg_select_policy.") #define DESCRIBE_DOC_NM_SETTING_TEAM_RUNNER_FAST_RATE N_("Corresponds to the teamd runner.fast_rate.") -- 2.14.3