mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

Merge remote-tracking branch 'origin/staging3.1.1' into dev

Browse Source
This commit is contained in:
Julien Fortin
2016-09-13 17:11:38 -07:00
parent abbf513ef4 0309264919
commit df4327e9ca
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
addons/address.py
View File

@@ -335,8 +335,7 @@ class address(moduleBase):
try:
self.ipcmd.batch_commit()
except Exception as e:
self.logger.error('%s: %s' % (ifaceobj.name, str(e)))
ifaceobj.set_status(ifaceStatus.ERROR)
self.log_error('%s: %s' % (ifaceobj.name, str(e)), ifaceobj, raise_error=False)
try:
hwaddress = self._get_hwaddress(ifaceobj)

1
addons/vrf.py
View File

@@ -302,7 +302,6 @@ class vrf(moduleBase):
self.iproute2_vrf_map_fd.flush()
self.vrf_count += 1
return
if old_vrf_name != vrfifaceobj.name:
self.log_error('table id %d already assigned to vrf dev %s'
%(table_id, old_vrf_name))