Updated patch

2015.5.10-dnf.patch

@@ -2204,3 +2204,71 @@ index 0000000..9c01d5b
 +        version = ':'.join((epoch, version))
 +
 +    return pkginfo(name, version, arch, repoid)
+diff --git a/salt/modules/debian_ip.py b/salt/modules/debian_ip.py
+index d0d6db1..275cb97 100644
+--- a/salt/modules/debian_ip.py
++++ b/salt/modules/debian_ip.py
+@@ -819,9 +819,12 @@ def _parse_settings_bond_0(opts, iface, bond_def):
+     if 'arp_ip_target' in opts:
+         if isinstance(opts['arp_ip_target'], list):
+             if 1 <= len(opts['arp_ip_target']) <= 16:
+-                bond.update({'arp_ip_target': []})
++                bond.update({'arp_ip_target': ''})
+                 for ip in opts['arp_ip_target']:  # pylint: disable=C0103
+-                    bond['arp_ip_target'].append(ip)
++                    if len(bond['arp_ip_target']) > 0:
++                        bond['arp_ip_target'] = bond['arp_ip_target'] + ',' + ip
++                    else:
++                        bond['arp_ip_target'] = ip
+             else:
+                 _raise_error_iface(iface, 'arp_ip_target', valid)
+         else:
+@@ -892,9 +895,12 @@ def _parse_settings_bond_2(opts, iface, bond_def):
+     if 'arp_ip_target' in opts:
+         if isinstance(opts['arp_ip_target'], list):
+             if 1 <= len(opts['arp_ip_target']) <= 16:
+-                bond.update({'arp_ip_target': []})
++                bond.update({'arp_ip_target': ''})
+                 for ip in opts['arp_ip_target']:  # pylint: disable=C0103
+-                    bond['arp_ip_target'].append(ip)
++                    if len(bond['arp_ip_target']) > 0:
++                        bond['arp_ip_target'] = bond['arp_ip_target'] + ',' + ip
++                    else:
++                        bond['arp_ip_target'] = ip
+             else:
+                 _raise_error_iface(iface, 'arp_ip_target', valid)
+         else:
+diff --git a/salt/modules/rh_ip.py b/salt/modules/rh_ip.py
+index 2762125..cd362e4 100644
+--- a/salt/modules/rh_ip.py
++++ b/salt/modules/rh_ip.py
+@@ -276,9 +276,12 @@ def _parse_settings_bond_0(opts, iface, bond_def):
+     if 'arp_ip_target' in opts:
+         if isinstance(opts['arp_ip_target'], list):
+             if 1 <= len(opts['arp_ip_target']) <= 16:
+-                bond.update({'arp_ip_target': []})
++                bond.update({'arp_ip_target': ''})
+                 for ip in opts['arp_ip_target']:  # pylint: disable=C0103
+-                    bond['arp_ip_target'].append(ip)
++                    if len(bond['arp_ip_target']) > 0:
++                        bond['arp_ip_target'] = bond['arp_ip_target'] + ',' + ip
++                    else:
++                        bond['arp_ip_target'] = ip
+             else:
+                 _raise_error_iface(iface, 'arp_ip_target', valid)
+         else:
+@@ -349,9 +352,12 @@ def _parse_settings_bond_2(opts, iface, bond_def):
+     if 'arp_ip_target' in opts:
+         if isinstance(opts['arp_ip_target'], list):
+             if 1 <= len(opts['arp_ip_target']) <= 16:
+-                bond.update({'arp_ip_target': []})
++                bond.update({'arp_ip_target': ''})
+                 for ip in opts['arp_ip_target']:  # pylint: disable=C0103
+-                    bond['arp_ip_target'].append(ip)
++                    if len(bond['arp_ip_target']) > 0:
++                        bond['arp_ip_target'] = bond['arp_ip_target'] + ',' + ip
++                    else:
++                        bond['arp_ip_target'] = ip
+             else:
+                 _raise_error_iface(iface, 'arp_ip_target', valid)
+         else:

salt.spec

@@ -16,7 +16,7 @@
 
 Name: salt
 Version: 2015.5.10
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A parallel remote execution system
 
 Group:   System Environment/Daemons
@@ -460,6 +460,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue May 31 2016 Erik Johnson <erik@saltstack.com> - 2015.5.10-2
+- Updated patch
+
 * Fri May 27 2016 Erik Johnson <erik@saltstack.com> - 2015.5.10-1
 - Update to bugfix release 2015.5.10