]> git.proxmox.com Git - mirror_frr.git/commit
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster
authorDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 30 Oct 2015 12:52:29 +0000 (05:52 -0700)
committerDonald Sharp <sharpd@cumulusnetworks.com>
Fri, 30 Oct 2015 12:52:29 +0000 (05:52 -0700)
commitbe5e48abecd137b47e4493a8fd616186c61f48f7
tree4184faeca4bb606af98deb606d9b53db3ac314b4
parent526e17284570266dcdd606ff163a614e6b3655a5
parent2bed4e86e378334341e01f3afe33784ef2713e83
Merge branch 'cmaster' of ssh://stash.cumulusnetworks.com:7999/quag/quagga into cmaster

Conflicts:
zebra/rib.h
zebra/zebra_rib.c
zebra/zebra_vty.c
lib/memtypes.c
zebra/rib.h
zebra/zebra_rib.c
zebra/zebra_vty.c