]> git.proxmox.com Git - mirror_ifupdown2.git/commit
Merge remote-tracking branch 'cumulus/dev'
authorRoopa Prabhu <roopa@cumulusnetworks.com>
Fri, 2 Sep 2016 22:45:58 +0000 (15:45 -0700)
committerRoopa Prabhu <roopa@cumulusnetworks.com>
Fri, 2 Sep 2016 22:45:58 +0000 (15:45 -0700)
commit0ab836bd276486fbca7b67fba9b56b9d93cb5cbe
tree7f5c9c9e9e2af55ea36a690599ffbc441835cb14
parentb2236589681e119391996f154c0a3ae46e902e00
parent6f5b74f7cc318f3a8836ac4f2502fc45d5939e22
Merge remote-tracking branch 'cumulus/dev'

Conflicts:
config/ifupdown2.conf
nlmanager/nllistener.py