From: Maria Matejka <mq@ucw.cz>
Date: Thu, 28 Nov 2024 08:04:31 +0000 (+0100)
Subject: Merge commit 'e29f134a' into thread-merge-2.16
X-Git-Tag: v3.0.0~69
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce2ecbdcb6d431d9a00b4837103404873058feac;p=thirdparty%2Fbird.git

Merge commit 'e29f134a' into thread-merge-2.16
---

ce2ecbdcb6d431d9a00b4837103404873058feac
diff --cc nest/config.Y
index 2da68b337,6b89f5d85..3dc28dd7e
--- a/nest/config.Y
+++ b/nest/config.Y
@@@ -159,12 -121,11 +159,11 @@@ CF_KEYWORDS(PASSWORD, KEY, FROM, PASSIV
  CF_KEYWORDS(ALGORITHM, KEYED, HMAC, MD5, SHA1, SHA256, SHA384, SHA512, BLAKE2S128, BLAKE2S256, BLAKE2B256, BLAKE2B512)
  CF_KEYWORDS(PRIMARY, STATS, COUNT, FOR, IN, COMMANDS, PREEXPORT, NOEXPORT, EXPORTED, GENERATE)
  CF_KEYWORDS(BGP, PASSWORDS, DESCRIPTION)
 -CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, IGP_METRIC, CLASS, DSCP)
 +CF_KEYWORDS(RELOAD, IN, OUT, MRTDUMP, MESSAGES, RESTRICT, MEMORY, CLASS, DSCP, PARTIAL)
  CF_KEYWORDS(TIMEFORMAT, ISO, SHORT, LONG, ROUTE, PROTOCOL, BASE, LOG, S, MS, US)
  CF_KEYWORDS(GRACEFUL, RESTART, WAIT, MAX, AS)
- CF_KEYWORDS(MIN, IDLE, RX, TX, INTERVAL, MULTIPLIER, PASSIVE)
  CF_KEYWORDS(CHECK, LINK)
 -CF_KEYWORDS(SORTED, TRIE, MIN, MAX, SETTLE, TIME, GC, THRESHOLD, PERIOD)
 +CF_KEYWORDS(CORK, SORTED, TRIE, MIN, MAX, ROA, DIGEST, ROUTE, REFRESH, SETTLE, TIME, GC, THRESHOLD, PERIOD)
  CF_KEYWORDS(MPLS_LABEL, MPLS_POLICY, MPLS_CLASS)
  CF_KEYWORDS(ASPA_PROVIDERS)