diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-08-18 02:52:04 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-08-18 02:52:04 +0200 |
| commit | ac01cff9ec30b0bf28888a1bbedc34b74b40cd37 (patch) | |
| tree | 73c78ea1c652ce551d60a59a649270fff947336e /cumulus | |
| parent | ospfd: Remove HAVE_OSPF_TE (diff) | |
| parent | BGP: neighbor activate lines for ipv4 unicast are not in the sub context (diff) | |
| download | frr-ac01cff9ec30b0bf28888a1bbedc34b74b40cd37.tar.xz frr-ac01cff9ec30b0bf28888a1bbedc34b74b40cd37.zip | |
Merge remote-tracking branch 'origin/cmaster' into cmaster-next
Diffstat (limited to 'cumulus')
| -rw-r--r-- | cumulus/etc/quagga/Quagga.conf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cumulus/etc/quagga/Quagga.conf b/cumulus/etc/quagga/Quagga.conf index a0b3ee0cf..e52f3f8aa 100644 --- a/cumulus/etc/quagga/Quagga.conf +++ b/cumulus/etc/quagga/Quagga.conf @@ -1,3 +1,2 @@ log file /var/log/quagga/quagga.log log timestamp precision 6 - |