]> git.proxmox.com Git - mirror_ifupdown2.git/commit - debian/changelog
Merge branch 'eadev' into dev
authorRoopa Prabhu <roopa@cumulusnetworks.com>
Fri, 2 Sep 2016 23:06:58 +0000 (16:06 -0700)
committerRoopa Prabhu <roopa@cumulusnetworks.com>
Fri, 2 Sep 2016 23:06:58 +0000 (16:06 -0700)
commit89a0bc651271ae0e439752b4557214b41fc679b0
treee0b8399591cc75590518513d8e62e4c472ce683c
parent6f5b74f7cc318f3a8836ac4f2502fc45d5939e22
parent29d834f6a8284082a2fb0888fb99a6fe86a7e0df
Merge branch 'eadev' into dev

Conflicts:
addons/address.py
addons/bridge.py
nlmanager/nlmanager.py