]> git.proxmox.com Git - mirror_frr.git/commit
Merge remote-tracking branch 'origin/cmaster' into cmaster-next
authorDonald Sharp <sharpd@cumulusnetworks.com>
Sat, 19 Nov 2016 17:31:41 +0000 (12:31 -0500)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Sat, 19 Nov 2016 17:31:41 +0000 (12:31 -0500)
commit7fe3cf138f790e43a180d1dc9910253cfc233cd4
treeb17cd94f66886765d7b469448b47cd68651a89cb
parent03f99d9a4dd4b1b1c788c9c7dd48f52eecd48de4
parent71c35aae1dcc4fce4811f27930cd5072fe6a8089
Merge remote-tracking branch 'origin/cmaster' into cmaster-next

Conflicts:
debian/changelog
zebra/zebra_rnh.c
zebra/zebra_rnh.c