Maria Matejka
41d6002f59
Merge commit 'a740054db50b8532680bd1673a5d4519af889c0f' into mq-merge-step-1
2024-01-28 14:55:49 +01:00
Maria Matejka
94a95a6944
Merge commit 'v2.14-28-g87fcb810' into mq-merge-step-2
2024-01-28 14:54:06 +01:00
Maria Matejka
87fcb810af
Merge commit '06301a991d80597a2a0a9e449d0cdf4bc1eda6d1' into mq-merge-step-1
2024-01-28 14:54:05 +01:00
Maria Matejka
12dae9264c
Merge commit 'v2.14-76-ge728c60b' into thread-next
2024-01-28 14:53:47 +01:00
Maria Matejka
e728c60be5
Merge commit 'v2.14-25-gb5378447' into mq-merge-step-2
2024-01-28 14:53:38 +01:00
Maria Matejka
b537844756
Merge commit '108c4cfaf3b0fda5daf4bccf2f1ea45d7f3a271d' into mq-merge-step-1
2024-01-28 14:53:36 +01:00
Maria Matejka
969f3855c3
Merge commit 'v2.14-73-g07e4750a' into thread-next
2024-01-28 14:52:38 +01:00
Maria Matejka
07e4750ac2
Merge commit 'v2.14-23-gf9bef5b9' into mq-merge-step-2
2024-01-28 14:52:33 +01:00
Maria Matejka
f9bef5b989
Merge commit 'c9b7b032110fbd49a5f084bfe3bc886e0e1edfe4' into mq-merge-step-1
2024-01-28 14:52:32 +01:00
Maria Matejka
b6be104317
Merge commit '5973031460372a4d695c44a9f398d516b0e5bac1' into thread-next
2024-01-28 14:52:07 +01:00
Maria Matejka
0639394961
Merge commit 'v2.14-66-ga5e32759' into thread-next
2024-01-28 14:45:33 +01:00
Maria Matejka
ffd26cf2b2
Merge commit 'v2.14-21-gbd56a41b' into mq-merge-step-2
2024-01-28 14:45:06 +01:00
Maria Matejka
bd56a41b3a
Merge commit '5973031460372a4d695c44a9f398d516b0e5bac1' into mq-merge-step-1
2024-01-28 14:45:04 +01:00
Maria Matejka
a5e3275968
Merge commit 'v2.14-18-g1d0371a6' into mq-merge-step-2
2024-01-28 14:43:21 +01:00
Maria Matejka
1d0371a675
Merge commit '0e1fbaa5b21db8e5c64a732dbaf0b8afe707a147' into mq-merge-step-1
2024-01-28 14:43:20 +01:00
Maria Matejka
8fe58b9f8d
Merge commit 'v2.13.1-192-gb8312130' into thread-next
2024-01-28 14:43:05 +01:00
Maria Matejka
b831213072
Merge commit 'v2.13.1-145-g605780f9' into mq-merge-step-2
2024-01-28 14:42:57 +01:00
Maria Matejka
605780f9f5
Merge commit 'c5c3a22bccda5454775b48ad318a7fd4bf197f86' into mq-merge-step-1
2024-01-28 14:42:56 +01:00
Maria Matejka
7045a715cf
Merge commit 'v2.13.1-189-g105e50f6' into thread-next
2024-01-28 14:42:36 +01:00
Maria Matejka
105e50f69c
Merge commit 'v2.13.1-143-g7441ff74' into mq-merge-step-2
2024-01-28 14:39:01 +01:00
Maria Matejka
7441ff7454
Merge commit 'e83beb70bd14923cece5b35411606ade6fb8fbee' into mq-merge-step-1
2024-01-28 14:39:00 +01:00
Maria Matejka
4628a117d9
Merge commit 'v2.13.1-186-g761649e6' into thread-next
2024-01-28 14:38:43 +01:00
Maria Matejka
761649e66b
Merge commit 'v2.13.1-141-g4f806813' into mq-merge-step-2
2024-01-28 14:29:16 +01:00
Maria Matejka
4f806813b2
Merge commit '57aa077227d1f2440dc1b2bb6cbbebd418a6b898' into mq-merge-step-1
2024-01-28 14:29:15 +01:00
Maria Matejka
8d2ec536d9
Merge commit 'v2.13.1-183-g2b05844c' into thread-next
2024-01-28 14:28:17 +01:00
Maria Matejka
2b05844cfb
Merge commit 'v2.13.1-139-gc9d1ebbd' into mq-merge-step-2
2024-01-28 14:28:09 +01:00
Maria Matejka
c9d1ebbd42
Merge commit 'ba01a6f2e66d03eb5d9426fdf4973f30e09c5710' into mq-merge-step-1
2024-01-28 14:28:07 +01:00
Maria Matejka
772922b37b
Merge commit 'v2.13.1-180-g9d8b8959' into thread-next
2024-01-28 14:27:50 +01:00
Maria Matejka
9d8b8959af
Merge commit 'v2.13.1-137-g31e60fd4' into mq-merge-step-2
2024-01-28 14:24:55 +01:00
Maria Matejka
31e60fd4f2
Merge commit 'de09fda5dcef16bf50663f7ffb56074e6ad20b5a' into mq-merge-step-1
2024-01-28 14:24:54 +01:00
Maria Matejka
22d7dbce74
Merge commit 'v2.13.1-177-g0ab64e27' into thread-next
2024-01-28 14:24:33 +01:00
Maria Matejka
0ab64e2739
Merge commit 'v2.13.1-135-gb560a074' into mq-merge-step-2
2024-01-28 14:22:53 +01:00
Maria Matejka
b560a0749b
Merge commit 'abae806efdf6ac5f919c93057dd8df1faff1058c' into mq-merge-step-1
2024-01-28 14:22:51 +01:00
Maria Matejka
72ba1ba34f
Merge commit 'v2.13.1-174-g7a4314ee' into thread-next
2024-01-28 14:22:29 +01:00
Maria Matejka
7a4314ee02
Merge commit 'v2.13.1-133-g7cc3d300' into mq-merge-step-2
2024-01-28 14:20:45 +01:00
Maria Matejka
7cc3d3009a
Merge commit 'ab47c2ae466f785212f0519388417ebb31b2cf24' into mq-merge-step-1
2024-01-28 14:20:44 +01:00
Maria Matejka
b88b724e86
Merge commit 'v2.13.1-171-g92832b2f' into thread-next
2024-01-28 14:20:29 +01:00
Maria Matejka
92832b2f6b
Merge commit 'v2.13.1-131-g21c3a54d' into mq-merge-step-2
2024-01-28 14:20:22 +01:00
Maria Matejka
21c3a54d87
Merge commit 'd41b06238dc2167f8e470aa2fb31cb937ff8fb3e' into mq-merge-step-1
2024-01-28 14:20:21 +01:00
Maria Matejka
a28264adc5
Merge commit 'v2.13.1-168-g5e9cf0ab' into thread-next
2024-01-28 13:40:23 +01:00
Maria Matejka
5e9cf0ab59
Merge commit 'v2.13.1-129-g481d3acc' into mq-merge-step-2
2024-01-28 13:30:06 +01:00
Maria Matejka
481d3acca9
Merge commit '6a242b3ec66f2ab89f9277e67125eab3e3676644' into mq-merge-step-1
2024-01-28 13:30:05 +01:00
Maria Matejka
caacd78c47
Merge commit 'v2.13.1-165-gd81996d7' into thread-next
2024-01-28 13:29:30 +01:00
Maria Matejka
d81996d7dd
Merge commit 'v2.13.1-127-gdcd0cc08' into mq-merge-step-2
2024-01-28 13:29:24 +01:00
Maria Matejka
dcd0cc083c
Merge commit '0bfa216f496279905b843abcfb1242477b86783c' into mq-merge-step-1
2024-01-28 13:29:22 +01:00
Maria Matejka
6a80214fb3
BGP: fixed MPLS label stack receiving bug
...
Introduced in 515df18da7
2024-01-28 13:16:25 +01:00
Maria Matejka
ea0f2c6194
Fixed attributes normalization with underlays in place
2024-01-28 13:16:25 +01:00
Maria Matejka
f9d3112d01
Interfaces: fixed locking when address is deleted implicitly
2024-01-27 19:01:34 +01:00
Maria Matejka
57b5eb5cbd
Merge commit 'v2.13.1-162-g5bf25678' into thread-next
2024-01-27 19:01:06 +01:00
Ondrej Zajicek
f40e2bc270
Nest: Fix bug in recursive routes with MPLS-labeled nexthops
...
When a recursive route with MPLS-labeled nexthop was exported to kernel
and read back, the nexthop_same() failed due to different labels_orig
field and kernel protocol reinstalled it unnecessarily.
For comparing hext hops, route cache has to distinguish ones with
different labels_orig, but KRT has to ignore that, so we need two
nexthop compare functions.
Thanks to Marcel Menzel for the bugreport.
2024-01-27 17:38:06 +01:00
