From: Maria Matejka <mq@ucw.cz>
Date: Wed, 2 Mar 2022 09:01:44 +0000 (+0100)
Subject: Merge commit '2c13759136951ef0e70a3e3c2b2d3c9a387f7ed9' into haugesund
X-Git-Tag: v2.0.11~73
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d071aca7aaf7a4add9e0d1d93029fb9a0fad560a;p=thirdparty%2Fbird.git

Merge commit '2c13759136951ef0e70a3e3c2b2d3c9a387f7ed9' into haugesund
---

d071aca7aaf7a4add9e0d1d93029fb9a0fad560a
diff --cc filter/config.Y
index 8916ea977,e6b59cbe9..f27fbbaae
--- a/filter/config.Y
+++ b/filter/config.Y
@@@ -287,10 -286,9 +287,10 @@@ CF_KEYWORDS(FUNCTION, PRINT, PRINTN, UN
  	DEFINED,
  	ADD, DELETE, CONTAINS, RESET,
  	PREPEND, FIRST, LAST, LAST_NONAGGREGATED, MATCH,
 +	MIN, MAX,
  	EMPTY,
  	FILTER, WHERE, EVAL, ATTRIBUTE,
- 	BT_ASSERT, BT_TEST_SUITE, BT_CHECK_ASSIGN, BT_TEST_SAME, FORMAT)
+ 	BT_ASSERT, BT_TEST_SUITE, BT_CHECK_ASSIGN, BT_TEST_SAME, FORMAT, STACKS)
  
  %nonassoc THEN
  %nonassoc ELSE