]> git.ipfire.org Git - thirdparty/bird.git/commit
Merge commit 'df476c2e' into thread-next
authorMaria Matejka <mq@ucw.cz>
Tue, 20 Sep 2022 11:10:29 +0000 (13:10 +0200)
committerMaria Matejka <mq@ucw.cz>
Tue, 20 Sep 2022 11:10:29 +0000 (13:10 +0200)
commita00e0b5930b6f1e56eed65cb5250aa9120a6f506
treedda830c24d4f505a470cf1ff5ca359a24de20f5a
parent4ba52a26877f0f9ac91ace02b99624b7d8152d22
parentdf476c2e5d0684c3beab9058bc85d627b0e4d7ed
Merge commit 'df476c2e' into thread-next

Implemented the corking by our own commit, merging with "ours" strategy.