colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: merge branch 'fg/team_link_watchers_overwrite-rh1533926'

Browse Source 
https://bugzilla.redhat.com/show_bug.cgi?id=1533926
This commit is contained in:
Francesco Giudici
2018-01-22 19:23:25 +01:00
parent 381c1a19b6 d7f3c79881
commit 72bf38cad6
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
clients/common/nm-meta-setting-desc.c
View File

@@ -4026,6 +4026,7 @@ _set_fcn_team_link_watchers (ARGS_SET_FCN)
const char *const*iter;
NMTeamLinkWatcher *watcher;
nm_setting_team_clear_link_watchers (NM_SETTING_TEAM (setting));
strv = nm_utils_strsplit_set (value, ",");
for (iter = strv; strv && *iter; iter++) {
watcher = _parse_team_link_watcher (*iter, error);
@@ -4098,6 +4099,7 @@ _set_fcn_team_port_link_watchers (ARGS_SET_FCN)
const char *const*iter;
NMTeamLinkWatcher *watcher;
nm_setting_team_port_clear_link_watchers (NM_SETTING_TEAM_PORT (setting));
strv = nm_utils_strsplit_set (value, ",");
for (iter = strv; strv && *iter; iter++) {
watcher = _parse_team_link_watcher (*iter, error);
@@ -4943,10 +4945,10 @@ static const NMMetaPropertyType _pt_gobject_devices = {
"Properties available for the 'nsna_ping' link watcher:\n" \
" 'init-wait', 'interval', 'missed-max', 'target-host'*\n\n" \
"Properties available for the 'arp_ping' include all the ones for 'nsna_ping' and:\n" \
" 'source-host', 'validate-active', 'validate-inactive', 'send-always'.\n\n" \
" 'source-host'*, 'validate-active', 'validate-inactive', 'send-always'.\n\n" \
"Properties flagged with a '*' are mandatory.\n\n" \
"Example:\n" \
" name=arp_ping,source-host=172.16.1.1,target-host=172.16.1.254; name=ethtool,delay-up=3\n")
" name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, name=ethtool delay-up=3\n")
#define DEFINE_DCB_PROPRITY_PROPERTY_TYPE \