diff options
Diffstat (limited to 'doc/developer')
| -rw-r--r-- | doc/developer/ospf-sr.rst | 3 | ||||
| -rw-r--r-- | doc/developer/workflow.rst | 8 |
2 files changed, 5 insertions, 6 deletions
diff --git a/doc/developer/ospf-sr.rst b/doc/developer/ospf-sr.rst index 263db9dfb9..1c164433dc 100644 --- a/doc/developer/ospf-sr.rst +++ b/doc/developer/ospf-sr.rst @@ -310,8 +310,7 @@ Routing. ospf router-id 192.168.1.11 capability opaque segment-routing on - segment-routing global-block 10000 19999 - segment-routing local-block 5000 5999 + segment-routing global-block 10000 19999 local-block 5000 5999 segment-routing node-msd 8 segment-routing prefix 192.168.1.11/32 index 1100 diff --git a/doc/developer/workflow.rst b/doc/developer/workflow.rst index adab9725d9..688ce545fb 100644 --- a/doc/developer/workflow.rst +++ b/doc/developer/workflow.rst @@ -163,13 +163,13 @@ as early as possible, i.e. the first 2-week window. For reference, the expected release schedule according to the above is: +---------+------------+------------+------------+------------+------------+ -| Release | 2021-11-02 | 2022-03-01 | 2022-07-05 | 2022-11-01 | 2023-03-07 | +| Release | 2022-07-05 | 2022-11-01 | 2023-03-07 | 2023-07-04 | 2023-10-31 | +---------+------------+------------+------------+------------+------------+ -| RC | 2021-10-19 | 2022-02-15 | 2022-06-21 | 2022-10-18 | 2023-02-21 | +| RC | 2022-06-21 | 2022-10-18 | 2023-02-21 | 2023-06-20 | 2023-10-17 | +---------+------------+------------+------------+------------+------------+ -| dev/X.Y | 2021-10-05 | 2022-02-01 | 2022-06-07 | 2022-10-04 | 2023-02-07 | +| dev/X.Y | 2022-06-07 | 2022-10-04 | 2023-02-07 | 2023-06-06 | 2023-10-03 | +---------+------------+------------+------------+------------+------------+ -| freeze | 2021-09-21 | 2022-01-18 | 2022-05-24 | 2022-09-20 | 2023-01-24 | +| freeze | 2022-05-24 | 2022-09-20 | 2023-01-24 | 2023-05-23 | 2023-09-19 | +---------+------------+------------+------------+------------+------------+ Each release is managed by one or more volunteer release managers from the FRR |
