]> git.ipfire.org Git - thirdparty/bird.git/log
thirdparty/bird.git
20 months agoTMP: Trying to force OpenBSD to build with clang whatever-test
Maria Matejka [Sat, 18 Nov 2023 15:11:12 +0000 (16:11 +0100)] 
TMP: Trying to force OpenBSD to build with clang

20 months agofixup! Locking data structures
Maria Matejka [Tue, 14 Nov 2023 13:48:52 +0000 (14:48 +0100)] 
fixup! Locking data structures

20 months agoRoute table objects use the new locked object macro stack
Maria Matejka [Tue, 14 Nov 2023 11:53:40 +0000 (12:53 +0100)] 
Route table objects use the new locked object macro stack

20 months agoLocking data structures
Maria Matejka [Fri, 10 Nov 2023 20:33:53 +0000 (21:33 +0100)] 
Locking data structures

If a data structure is associated with a lock, having a public
and a private part, there are now useful macros for these data
structures.

20 months agoMerge commit '980ef11016546ecd409a7f83b33a2f8f758ec926' into thread-next
Maria Matejka [Fri, 10 Nov 2023 22:47:10 +0000 (23:47 +0100)] 
Merge commit '980ef11016546ecd409a7f83b33a2f8f758ec926' into thread-next

20 months agoC Compiler Attribute Cleanup Test
Maria Matejka [Thu, 26 Oct 2023 21:09:20 +0000 (23:09 +0200)] 
C Compiler Attribute Cleanup Test

There is a long-known CC attribute cleanup which allows to call a custom
cleanup function when an auto-storage variable ceases to exist. We're
gonna use it for end-of-loop and leave-locked-block macros.

This commit adds a static unit test for this compiler feature to be sure
that it really does what we want. We're looking forward to the next ISO
C norm where this may finally get a nice syntax and standardization.

20 months agoMore descriptive bug message on deadlock prevention
Maria Matejka [Thu, 9 Nov 2023 16:42:22 +0000 (17:42 +0100)] 
More descriptive bug message on deadlock prevention

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 16:38:31 +0000 (17:38 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit '8f5511da' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 15:53:45 +0000 (16:53 +0100)] 
Merge commit '8f5511da' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 15:53:34 +0000 (16:53 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit 'd8130da8' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 15:36:54 +0000 (16:36 +0100)] 
Merge commit 'd8130da8' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 15:34:26 +0000 (16:34 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit 'a7a9df86' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 15:34:20 +0000 (16:34 +0100)] 
Merge commit 'a7a9df86' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 15:34:04 +0000 (16:34 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit '9b775859' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 15:00:44 +0000 (16:00 +0100)] 
Merge commit '9b775859' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 15:00:32 +0000 (16:00 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit 'e915f99e' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 15:00:09 +0000 (16:00 +0100)] 
Merge commit 'e915f99e' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 14:59:03 +0000 (15:59 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit 'b6385dec' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 14:58:58 +0000 (15:58 +0100)] 
Merge commit 'b6385dec' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 14:58:41 +0000 (15:58 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit '81a20ca5' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 14:50:39 +0000 (15:50 +0100)] 
Merge commit '81a20ca5' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 14:50:32 +0000 (15:50 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit '35726051' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 14:50:28 +0000 (15:50 +0100)] 
Merge commit '35726051' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 14:50:15 +0000 (15:50 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 14:50:13 +0000 (15:50 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit 'fcf22586' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 14:50:02 +0000 (15:50 +0100)] 
Merge commit 'fcf22586' into mq-aggregator-for-v3

20 months agoMerge commit '8e9e013b' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 14:35:18 +0000 (15:35 +0100)] 
Merge commit '8e9e013b' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 14:35:11 +0000 (15:35 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit '3397ca51' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 14:35:08 +0000 (15:35 +0100)] 
Merge commit '3397ca51' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 14:34:59 +0000 (15:34 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit 'e338c4b6' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 14:34:54 +0000 (15:34 +0100)] 
Merge commit 'e338c4b6' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 14:20:13 +0000 (15:20 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit 'bcff3ae7' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 10:06:07 +0000 (11:06 +0100)] 
Merge commit 'bcff3ae7' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Thu, 9 Nov 2023 10:04:57 +0000 (11:04 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit '9ca86ef6' into mq-aggregator-for-v3
Maria Matejka [Thu, 9 Nov 2023 09:52:53 +0000 (10:52 +0100)] 
Merge commit '9ca86ef6' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Wed, 8 Nov 2023 21:24:33 +0000 (22:24 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit '9d456d53' into mq-aggregator-for-v3
Maria Matejka [Wed, 8 Nov 2023 21:14:58 +0000 (22:14 +0100)] 
Merge commit '9d456d53' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Wed, 8 Nov 2023 21:14:19 +0000 (22:14 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge commit '15c86ed0' into mq-aggregator-for-v3
Maria Matejka [Wed, 8 Nov 2023 20:56:58 +0000 (21:56 +0100)] 
Merge commit '15c86ed0' into mq-aggregator-for-v3

20 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Wed, 8 Nov 2023 20:51:46 +0000 (21:51 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

20 months agoMerge remote-tracking branch 'origin/partial-reload' into thread-next
Maria Matejka [Wed, 8 Nov 2023 16:37:42 +0000 (17:37 +0100)] 
Merge remote-tracking branch 'origin/partial-reload' into thread-next

20 months agoMPLS: Fix issue with recursive MPLS routes
Ondrej Zajicek [Mon, 16 Oct 2023 13:21:36 +0000 (15:21 +0200)] 
MPLS: Fix issue with recursive MPLS routes

Recursive MPLS routes used hostentry from the original route, which
triggered different table than MPLS table, and therefore were not
updated.

20 months agokrt.c: fixup lots of routes learn & unlearn
Katerina Kubecova [Mon, 6 Nov 2023 08:38:13 +0000 (09:38 +0100)] 
krt.c: fixup lots of routes learn & unlearn

21 months agoMerge branch 'thread-next' into HEAD partial-reload
Maria Matejka [Thu, 2 Nov 2023 13:43:15 +0000 (14:43 +0100)] 
Merge branch 'thread-next' into HEAD

21 months agoAutomatic ROA reloads on channel import
Katerina Kubecova [Thu, 2 Nov 2023 13:33:00 +0000 (14:33 +0100)] 
Automatic ROA reloads on channel import

This includes updating OSPF, Pipe and RIP to enable partial route reload
directly from the protocols' internal tables.

21 months agoFIB walk macros now allow continue from the loop
Katerina Kubecova [Thu, 2 Nov 2023 13:28:50 +0000 (14:28 +0100)] 
FIB walk macros now allow continue from the loop

21 months agoPrefiltering routes by net and custom hook for partial reloads
Maria Matejka [Wed, 4 Oct 2023 09:03:29 +0000 (11:03 +0200)] 
Prefiltering routes by net and custom hook for partial reloads

21 months agoChannel feeding request respects the subnet tries
Maria Matejka [Wed, 4 Oct 2023 08:39:46 +0000 (10:39 +0200)] 
Channel feeding request respects the subnet tries

21 months agoChannel feeding request has a done-hook
Maria Matejka [Wed, 4 Oct 2023 08:02:43 +0000 (10:02 +0200)] 
Channel feeding request has a done-hook

21 months agoMerge commit '333ddd4f' into mq-aggregator-for-v3
Maria Matejka [Wed, 1 Nov 2023 17:34:06 +0000 (18:34 +0100)] 
Merge commit '333ddd4f' into mq-aggregator-for-v3

21 months agoDumping route sources along with protocols and routes
Maria Matejka [Wed, 1 Nov 2023 17:25:40 +0000 (18:25 +0100)] 
Dumping route sources along with protocols and routes

21 months agoDebug file fix
Maria Matejka [Wed, 1 Nov 2023 17:25:15 +0000 (18:25 +0100)] 
Debug file fix

It got mistakenly closed while applying the log configuration.

21 months agoNexthop dump fix for unreachables
Maria Matejka [Wed, 1 Nov 2023 17:24:32 +0000 (18:24 +0100)] 
Nexthop dump fix for unreachables

21 months agoFixes to root pool and meta loop to allow resource dumps
Maria Matejka [Wed, 1 Nov 2023 17:23:43 +0000 (18:23 +0100)] 
Fixes to root pool and meta loop to allow resource dumps

21 months agoMerge branch 'mq-aggregator-for-v3' into HEAD
Maria Matejka [Wed, 1 Nov 2023 17:19:55 +0000 (18:19 +0100)] 
Merge branch 'mq-aggregator-for-v3' into HEAD

21 months agoMerge commit 'e55696a4' into mq-aggregator-for-v3
Maria Matejka [Wed, 1 Nov 2023 17:08:34 +0000 (18:08 +0100)] 
Merge commit 'e55696a4' into mq-aggregator-for-v3

21 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Wed, 1 Nov 2023 17:08:49 +0000 (18:08 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

21 months agoMerge commit '21213be5' into mq-aggregator-for-v3
Maria Matejka [Wed, 1 Nov 2023 16:49:12 +0000 (17:49 +0100)] 
Merge commit '21213be5' into mq-aggregator-for-v3

21 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Wed, 1 Nov 2023 16:48:00 +0000 (17:48 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

21 months agoMerge commit '8ad9c4bb' into mq-aggregator-for-v3
Maria Matejka [Wed, 1 Nov 2023 16:46:52 +0000 (17:46 +0100)] 
Merge commit '8ad9c4bb' into mq-aggregator-for-v3

21 months agoMerge branch 'mq-aggregator-for-v3' into thread-next
Maria Matejka [Wed, 1 Nov 2023 16:44:37 +0000 (17:44 +0100)] 
Merge branch 'mq-aggregator-for-v3' into thread-next

21 months agoAggregator: fixed route source unlocking on shutdown and withdraw
Maria Matejka [Wed, 1 Nov 2023 13:30:46 +0000 (14:30 +0100)] 
Aggregator: fixed route source unlocking on shutdown and withdraw

21 months agoMerge branch 'mq-aggregator-for-v3' into HEAD
Maria Matejka [Wed, 1 Nov 2023 09:58:44 +0000 (10:58 +0100)] 
Merge branch 'mq-aggregator-for-v3' into HEAD

21 months agoMerge branch 'mq-aggregator-for-v3' into HEAD
Maria Matejka [Wed, 1 Nov 2023 09:57:57 +0000 (10:57 +0100)] 
Merge branch 'mq-aggregator-for-v3' into HEAD

21 months agoAggregator: Fixed bugs in filter usage
Maria Matejka [Wed, 1 Nov 2023 09:57:43 +0000 (10:57 +0100)] 
Aggregator: Fixed bugs in filter usage

21 months agoMerge commit 'a4adb09f5a5c3806488fb121eafc0e6c969135e7' into HEAD
Maria Matejka [Wed, 1 Nov 2023 09:15:32 +0000 (10:15 +0100)] 
Merge commit 'a4adb09f5a5c3806488fb121eafc0e6c969135e7' into HEAD

21 months agoAggregator: Expressed most of the attribute logic in filter language
Maria Matejka [Tue, 31 Oct 2023 10:37:54 +0000 (11:37 +0100)] 
Aggregator: Expressed most of the attribute logic in filter language

21 months agoMerge commit 'ba91f4c831f057b81104d1453f99b012c01f9c9e' into thread-next
Maria Matejka [Tue, 31 Oct 2023 15:54:58 +0000 (16:54 +0100)] 
Merge commit 'ba91f4c831f057b81104d1453f99b012c01f9c9e' into thread-next

21 months agoMerge commit 'df5a08e7c717ff421a52b4144d741f0a9749159f' into thread-next
Maria Matejka [Tue, 31 Oct 2023 15:48:48 +0000 (16:48 +0100)] 
Merge commit 'df5a08e7c717ff421a52b4144d741f0a9749159f' into thread-next

21 months agoBasic route aggregation
Igor Putovny [Wed, 21 Jun 2023 11:15:07 +0000 (13:15 +0200)] 
Basic route aggregation

Add a new protocol offering route aggregation.

User can specify list of route attributes in the configuration file and
run route aggregation on the export side of the pipe protocol. Routes are
sorted and for every group of equivalent routes new route is created and
exported to the routing table. It is also possible to specify filter
which will run for every route before aggregation.

Furthermore, it will be possible to set attributes of new routes
according to attributes of the aggregated routes.

This is a work in progress.

Original work by Igor Putovny, subsequent cleanups and finalization by
Maria Matejka.

This is a split-commit of the neighboring aggregator branch
with a bit improved lvalue handling, to have easier merge into v3.

21 months agoFilters: allowing to return any number of values
Maria Matejka [Tue, 31 Oct 2023 11:03:49 +0000 (12:03 +0100)] 
Filters: allowing to return any number of values

21 months agoFilter: value hashing
Maria Matejka [Tue, 31 Oct 2023 10:52:30 +0000 (11:52 +0100)] 
Filter: value hashing

Added a code for computing hash of filter values.

This is a split-commit of the neighboring aggregator branch
with improved lvalue and attribute handling.

21 months agoMerge commit '407eb388b7082b52921e93476c8ff1a98fe3b873' into thread-next
Maria Matejka [Tue, 31 Oct 2023 09:28:01 +0000 (10:28 +0100)] 
Merge commit '407eb388b7082b52921e93476c8ff1a98fe3b873' into thread-next

21 months agoMerge commit 'f0187d713c36e841fe8bab350e84f5257a74981a' into thread-next
Maria Matejka [Tue, 31 Oct 2023 09:20:22 +0000 (10:20 +0100)] 
Merge commit 'f0187d713c36e841fe8bab350e84f5257a74981a' into thread-next

21 months agoMerge commit 'de70474fed139f9acb4ed3f8e925d12de4edcdd0' into thread-next
Maria Matejka [Tue, 31 Oct 2023 08:58:42 +0000 (09:58 +0100)] 
Merge commit 'de70474fed139f9acb4ed3f8e925d12de4edcdd0' into thread-next

21 months agoFilter: predefined variables for specific blocks
Maria Matejka [Mon, 30 Oct 2023 09:44:45 +0000 (10:44 +0100)] 
Filter: predefined variables for specific blocks

This is a split-commit of the neighboring aggregator branch
with a bit improved lvalue handling, to have easier merge into v3.

21 months agoFilter: adding explicit route-block type
Maria Matejka [Mon, 30 Oct 2023 08:49:20 +0000 (09:49 +0100)] 
Filter: adding explicit route-block type

This is a split-commit of the neighboring aggregator branch
with a bit improved lvalue handling, to have easier merge into v3.

21 months agoFilter: adding explicit route type
Maria Matejka [Sun, 29 Oct 2023 18:53:09 +0000 (19:53 +0100)] 
Filter: adding explicit route type

This is a split-commit of the neighboring aggregator branch
with a bit improved lvalue handling, to have easier merge into v3.

21 months agoRenamed nest/rt.h back to nest/route.h
Maria Matejka [Sun, 29 Oct 2023 15:25:01 +0000 (16:25 +0100)] 
Renamed nest/rt.h back to nest/route.h

Some [redacted] (yes, myself) had a really bad idea
to rename nest/route.h to nest/rt.h while refactoring
some data structures out of it.

This led to unnecessarily complex problems with
merging updates from v2. Reverting this change
to make my life a bit easier.

At least it needed only one find-sed command:

    find -name '*.[chlY]' -type f -exec sed -i 's#nest/rt.h#nest/route.h#' '{}' +

21 months agoMerge commit '0a729b50' into thread-next
Maria Matejka [Sun, 29 Oct 2023 14:42:46 +0000 (15:42 +0100)] 
Merge commit '0a729b50' into thread-next

This merge was particularly difficult. I finally resorted to delete the
symbol scope active flag altogether and replace its usage by other
means.

Also I had to update custom route attribute registration to fit
both the scope updates in v2 and the data model in v3.

21 months agoMerge commit 'bb8e2824' into thread-next
Maria Matejka [Sat, 28 Oct 2023 22:56:06 +0000 (00:56 +0200)] 
Merge commit 'bb8e2824' into thread-next

21 months agoMerge commit '9ffea830' into thread-next
Maria Matejka [Sat, 28 Oct 2023 22:51:34 +0000 (00:51 +0200)] 
Merge commit '9ffea830' into thread-next

21 months agoMerge commit 'a3dc2645' into thread-next
Maria Matejka [Sat, 28 Oct 2023 22:50:38 +0000 (00:50 +0200)] 
Merge commit 'a3dc2645' into thread-next

21 months agoMerge commit 'cc1099a0' into thread-next
Maria Matejka [Sat, 28 Oct 2023 22:14:52 +0000 (00:14 +0200)] 
Merge commit 'cc1099a0' into thread-next

Updated f_implicit_roa_check() to use type methods and moved to filter/f-util.c

21 months agoMerge commit 'c0231b09' into thread-next
Maria Matejka [Sat, 28 Oct 2023 22:02:04 +0000 (00:02 +0200)] 
Merge commit 'c0231b09' into thread-next

21 months agoMerge commit 'fdd39c81' into thread-next
Maria Matejka [Sat, 28 Oct 2023 22:00:07 +0000 (00:00 +0200)] 
Merge commit 'fdd39c81' into thread-next

21 months agoMerge commit 'fc9d471b' into thread-next
Maria Matejka [Sat, 28 Oct 2023 21:42:21 +0000 (23:42 +0200)] 
Merge commit 'fc9d471b' into thread-next

Conflicts:
conf/cf-lex.l
conf/conf.h
filter/config.Y
filter/data.c
filter/data.h

21 months agoMerge commit '6b95353e' into thread-next
Maria Matejka [Fri, 27 Oct 2023 16:30:37 +0000 (18:30 +0200)] 
Merge commit '6b95353e' into thread-next

21 months agoMerge commit '51f2e7af' into thread-next
Maria Matejka [Fri, 27 Oct 2023 16:29:31 +0000 (18:29 +0200)] 
Merge commit '51f2e7af' into thread-next

Conflicts:
conf/cf-lex.l
conf/conf.h
conf/confbase.Y
filter/config.Y
nest/config.Y
nest/proto.c
nest/rt-table.c
proto/bgp/bgp.c
sysdep/unix/main.c

21 months agoMerge commit '5951dfbd' into thread-next
Maria Matejka [Fri, 27 Oct 2023 13:56:06 +0000 (15:56 +0200)] 
Merge commit '5951dfbd' into thread-next

21 months agoMerge commit '58efa944' into thread-next
Maria Matejka [Wed, 25 Oct 2023 12:41:11 +0000 (14:41 +0200)] 
Merge commit '58efa944' into thread-next

Conflicts:
conf/cf-lex.l
conf/conf.h
conf/confbase.Y
conf/gen_keywords.m4
conf/gen_parser.m4
filter/config.Y
nest/config.Y
proto/bgp/config.Y
proto/static/config.Y

Keywords and attributes are split to separate namespaces, to avoid
collisions between regular keyword use and attribute overlay.

21 months agoMerge commit 'a5a6de58' into thread-next
Maria Matejka [Tue, 24 Oct 2023 08:39:52 +0000 (10:39 +0200)] 
Merge commit 'a5a6de58' into thread-next

Conflicts:
      filter/config.Y
      filter/data.h
      filter/data.c

21 months agoMerge commit '86598183' into thread-next
Maria Matejka [Tue, 24 Oct 2023 07:34:43 +0000 (09:34 +0200)] 
Merge commit '86598183' into thread-next

21 months agoMerge commit 'aa70e14c' into thread-next
Maria Matejka [Tue, 24 Oct 2023 07:34:06 +0000 (09:34 +0200)] 
Merge commit 'aa70e14c' into thread-next

21 months agoMerge commit 'f5140d10' into thread-next
Maria Matejka [Fri, 13 Oct 2023 13:18:07 +0000 (15:18 +0200)] 
Merge commit 'f5140d10' into thread-next

Smashed as "ours" as local changes are completely incompatible.
Relevant fixes will be merged from later commits if possible.

21 months agoMerge commit 'cce48c6c' into thread-next
Maria Matejka [Fri, 13 Oct 2023 12:02:21 +0000 (14:02 +0200)] 
Merge commit 'cce48c6c' into thread-next

21 months agoMerge commit '32427c9c' into thread-next
Maria Matejka [Fri, 13 Oct 2023 11:49:09 +0000 (13:49 +0200)] 
Merge commit '32427c9c' into thread-next

21 months agoMerge commit 'f411a19b' into thread-next
Maria Matejka [Fri, 13 Oct 2023 11:46:04 +0000 (13:46 +0200)] 
Merge commit 'f411a19b' into thread-next

21 months agoCI: Temporarily disabling test-ibgp-loop-big as it tends to hang
Maria Matejka [Fri, 13 Oct 2023 11:38:15 +0000 (13:38 +0200)] 
CI: Temporarily disabling test-ibgp-loop-big as it tends to hang

21 months agoMerge commit '0dbcc927' into thread-next
Maria Matejka [Fri, 13 Oct 2023 11:36:47 +0000 (13:36 +0200)] 
Merge commit '0dbcc927' into thread-next