From: Rafael Zalamena Date: Thu, 16 Aug 2018 21:34:59 +0000 (-0300) Subject: Merge pull request #2857 from donaldsharp/ptm_loves_us X-Git-Tag: frr-6.1-dev~55 X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ad03f5ec8a024357010abd80b2fa0225153e2752;p=matthieu%2Ffrr.git Merge pull request #2857 from donaldsharp/ptm_loves_us zebra: When using BFD ensure that zebra thinks ptm is disabled --- ad03f5ec8a024357010abd80b2fa0225153e2752