From f19730f58ac2ee32aa12d4ad510176fcc8ef1237 Mon Sep 17 00:00:00 2001 From: lguohan Date: Mon, 1 Feb 2021 12:02:37 -0800 Subject: [PATCH] [frr]: upgrade frr to frr-7.5-s2 tag (#6628) pick-up upstream fixes. important ones - bgpd: Removing "neighbor allowas-in" complete lists * 6b2b5cce3 2021-01-29 | Merge pull request #7977 from ton31337/fix/allowas_in_reset_value_7.5 (HEAD -> frr/7.5, tag: frr-7.5-s2, upstream/stable/7.5, origin/frr/7.5, stable/7.5) [Donald Sharp] |\ | * f403534df 2021-01-28 | bgpd: Removing "neighbor allowas-in" [Kishore Kunal] * | 86e2f106c 2021-01-28 | Merge pull request #7962 from ton31337/fix/bgpd_validate_community_7.5 [Donald Sharp] |\ \ | |/ |/| | * e182af45c 2021-01-05 | bgpd: separate lcommunity validation from tokenizer [Wesley Coakley] | * 2cf37d594 2020-12-30 | bgpd: Validate community list if they are not malformed [Donatas Abraitis] |/ * a4af08a19 2021-01-22 | Merge pull request #7912 from idryzhov/7.5-backports-2021-01 [Donald Sharp] |\ | * 160021013 2021-01-12 | bgpd : multiple memory leak fixes in show commands [Sarita Patra] | * 46a2b560f 2021-01-19 | tools: fix frr-reload BFD profile support [Rafael Zalamena] | * 7f6c81fca 2020-12-02 | ospfd: fix area removal at interface level [ckishimo] | * f7db4dfb1 2021-01-08 | bfdd: update vrf of received packet [Philippe Guibert] | * 4d470f3ef 2021-01-08 | bfdd: enable bfd session if vrf interface available [Philippe Guibert] | * c656985fb 2021-01-08 | bfdd: socket should be bound to vrf interface by default [Philippe Guibert] | * f30c002b8 2021-01-15 | bgpd: Allow peer-groups to have `ttl-security hops` configured [Donald Sharp] | * 85ff76513 2021-01-15 | configure.ac: Correct library name for sysrepo [Bo Zhang] | * d00c543f1 2020-12-04 | bgpd: Handle IPv6 prefixes with IPv4 nexthops for zebra [Donatas Abraitis] | * 87b9b2973 2021-01-06 | zebra: zebra route-map delay-timer is global not per vrf [Donald Sharp] | * 91e1adec9 2021-01-05 | bgpd: Fix default-originate clearing from peer-groups. [zyxwvu Shi] | * 0f2f32fa1 2021-01-05 | isisd: When last area address is removed, resign if we were DR [Karen Schoener] | * 842e99d49 2021-01-02 | vrrpd.yang bug fix: modify augment path to comply with rfc 7950 [Bo Zhang] | * 9616ef937 2020-12-24 | ospfd: fix no show database output when selecting vrf [Louis Scalbert] | * 4c4764e36 2020-11-30 | ospf6d: ospfv3 disable on the interface, but interface prefix still shown in the output [Yash Ranjan] | * 1870dbd86 2020-12-14 | ospf6d: Link LSA is not updated when router priority is modified [Mobashshera Rasool] | * 4883a06c3 2020-12-10 | bgpd: fix evpn route-map vni filter at origin [Chirag Shah] |/ * 9c087052a 2021-01-15 | Merge pull request #7877 from vishaldhingra/static_7_5 [Mark Stapp] |\ | * a687b6b27 2021-01-15 | staticd: Backend cofiguration code to fix table-id problem [vdhingra] | * 52370b494 2021-01-15 | staticd: autogenerated code modifications due to yang changes [vdhingra] | * f9d6511f2 2021-01-15 | staticd: make table-id as the key for path-list [vdhingra] |/ Signed-off-by: Guohan Lu --- rules/frr.mk | 2 +- src/sonic-frr/frr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/frr.mk b/rules/frr.mk index 7572beb3b06c..bb6a96a61fa4 100644 --- a/rules/frr.mk +++ b/rules/frr.mk @@ -3,7 +3,7 @@ FRR_VERSION = 7.5 FRR_SUBVERSION = 0 FRR_BRANCH = frr/7.5 -FRR_TAG = frr-7.5-s1 +FRR_TAG = frr-7.5-s2 export FRR_VERSION FRR_SUBVERSION FRR_BRANCH FRR_TAG diff --git a/src/sonic-frr/frr b/src/sonic-frr/frr index 4ed6312d10d3..6b2b5cce3557 160000 --- a/src/sonic-frr/frr +++ b/src/sonic-frr/frr @@ -1 +1 @@ -Subproject commit 4ed6312d10d369f621f69202ad39cfa6a597c59c +Subproject commit 6b2b5cce3557a383942fc194257da77e4e5270e4