From a38ceb10830a9491bc9d615cd41895d51712f2b9 Mon Sep 17 00:00:00 2001 From: "a.ardeev" Date: Tue, 2 Sep 2025 14:15:44 +0300 Subject: [PATCH 1/6] Limits calendar in "2.11" with 2026. Fixes #5282 --- doc/release/_images/releases_calendar_2_x.svg | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 doc/release/_images/releases_calendar_2_x.svg diff --git a/doc/release/_images/releases_calendar_2_x.svg b/doc/release/_images/releases_calendar_2_x.svg new file mode 100644 index 000000000..fc3f4d02a --- /dev/null +++ b/doc/release/_images/releases_calendar_2_x.svg @@ -0,0 +1,4 @@ + + + +
2024
2024
2025
2025
2026
2026
Apr
Apr
Jul
Jul
Oct
Oct
Jan
Jan
Apr
Apr
Jul
Jul
Oct
Oct
Jan
Jan
2.11 LTS
2.11 LTS
2.11.2
2.11.2
2.10
2.10
2.10.8
2.10.8
Release
Release
Updates and fixes
Updates and fixes
Support
Support
x.y
x.y
EOL series
EOL series
x.y
x.y
Current series
Current series
2.11.3
2.11.3
2.11.4
2.11.4
Jan
Jan
2.11.5
2.11.5
2.11.6
2.11.6Text is not SVG - cannot display \ No newline at end of file From b3d24725130906ea1d525a2b8a0220d88a2682b5 Mon Sep 17 00:00:00 2001 From: "a.ardeev" Date: Tue, 2 Sep 2025 14:57:02 +0300 Subject: [PATCH 2/6] Adds link to latest --- doc/release/calendar.rst | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/doc/release/calendar.rst b/doc/release/calendar.rst index e13bcaad1..be3e06e10 100644 --- a/doc/release/calendar.rst +++ b/doc/release/calendar.rst @@ -1,8 +1,27 @@ Release calendar ================ -Every Tarantool release series has :ref:`the same lifecycle `. -To see the lifecycle of Tarantool 2.x versions supported in 2025 see the `calendar `_. +This section contains information about 1.x and 2.x Tarantool releases: release notes, lifecycle information, release policy, and other documents. + +.. _release-supported-versions: + +Supported versions +------------------ + +Every Tarantool release series has :ref:`the same lifecycle ` +defined by the release policy. The following diagram visualizes the lifecycle of currently supported Tarantool 2.x versions: + +.. image:: _images/releases_calendar_2_x.svg + :align: center + :alt: Release calendar + +.. note:: + + *End of life* (*EOL*) means the release series will no longer receive any patches, + updates, or feature improvements after the specified date. + + *End of support* (*EOS*) means that we won't provide technical support to product + versions after the specified date. .. _release-table: @@ -10,12 +29,9 @@ Release lifetime table ---------------------- The release lifetime table lists all Tarantool versions -starting from 1.10.x up to the current latest versions. -Each link leads to the release notes page of the corresponding version. -*End of life* means the release series will no longer receive any patches, updates, -or feature improvements after the specified date. -*End of support* means that we won't provide technical support to product versions -after the specified date. +starting from 1.10.x up to the 2.11.7 version. To see the information about Tarantool 3.x versions, +see the corresponding `page `_. + .. container:: table From c95dec26870c4ced3afc8c3260edc4a31b8b5cb3 Mon Sep 17 00:00:00 2001 From: "a.ardeev" Date: Tue, 2 Sep 2025 15:21:34 +0300 Subject: [PATCH 3/6] Rewrites the calendar page to make it consistent with the latest version --- doc/release/calendar.rst | 161 ++------------------------------------- 1 file changed, 7 insertions(+), 154 deletions(-) diff --git a/doc/release/calendar.rst b/doc/release/calendar.rst index be3e06e10..abed1c2e2 100644 --- a/doc/release/calendar.rst +++ b/doc/release/calendar.rst @@ -1,7 +1,8 @@ Release calendar ================ -This section contains information about 1.x and 2.x Tarantool releases: release notes, lifecycle information, release policy, and other documents. +This section contains general information and links to appropriate pages containing details +about 1.x and 2.x Tarantool releases: release notes, lifecycle information, release policy, and other info. .. _release-supported-versions: @@ -23,16 +24,13 @@ defined by the release policy. The following diagram visualizes the lifecycle of *End of support* (*EOS*) means that we won't provide technical support to product versions after the specified date. -.. _release-table: +The table below provides information about currently supported versions with links to their +*What's new* pages in the documentation and/or detailed changelogs on GitHub. +For information about earlier versions, see :doc:`eos_versions`. -Release lifetime table ----------------------- - -The release lifetime table lists all Tarantool versions -starting from 1.10.x up to the 2.11.7 version. To see the information about Tarantool 3.x versions, +To see the information about Tarantool 3.x versions, see the corresponding `page `_. - .. container:: table .. list-table:: @@ -125,149 +123,4 @@ see the corresponding `page `_. * - :doc:`2.10.0 ` - May 22, 2022 - September 14, 2023 - - December 31, 2025 - - * - :doc:`2.8.4 ` - - April 25, 2022 - - April 25, 2022 - - December 31, 2024 - - * - :doc:`2.8.3 ` - - December 22, 2021 - - April 25, 2022 - - December 31, 2024 - - * - :doc:`2.8.2 ` - - August 19, 2021 - - April 25, 2022 - - December 31, 2024 - - * - :doc:`2.7.3 ` - - August 19, 2021 - - August 19, 2021 - - August 19, 2021 - - * - :doc:`2.7.2 ` - - April 21, 2021 - - August 19, 2021 - - August 19, 2021 - - * - :doc:`2.6.3 ` - - April 21, 2021 - - April 21, 2021 - - April 21, 2021 - - * - :doc:`2.6.2 ` - - December 30, 2020 - - April 21, 2021 - - April 21, 2021 - - * - :doc:`2.5.3 ` - - December 30, 2020 - - December 30, 2020 - - December 30, 2020 - - * - :doc:`2.5.2 ` - - October 22, 2020 - - December 30, 2020 - - December 30, 2020 - - * - :doc:`2.4.3 ` - - October 22, 2020 - - October 22, 2020 - - October 22, 2020 - - * - :doc:`2.4.2 ` - - July 17, 2020 - - October 22, 2020 - - October 22, 2020 - - * - :doc:`2.3.3 ` - - July 17, 2020 - - July 17, 2020 - - July 17, 2020 - - * - :doc:`2.3.2 ` - - April 20, 2020 - - July 17, 2020 - - July 17, 2020 - - * - :doc:`2.2.3 ` - - April 20, 2020 - - April 20, 2020 - - April 20, 2020 - - * - :doc:`2.2.2 ` - - December 31, 2019 - - April 20, 2020 - - April 20, 2020 - - * - :doc:`1.10.15 LTS ` - - February 20, 2023 - - February 20, 2023 - - February, 2024 - - * - :doc:`1.10.14 LTS ` - - August 8, 2022 - - February 20, 2023 - - February, 2024 - - * - :doc:`1.10.13 LTS ` - - April 25, 2022 - - February 20, 2023 - - February, 2024 - - * - :doc:`1.10.12 LTS ` - - December 22, 2021 - - February 20, 2022 - - February 20, 2023 - - * - :doc:`1.10.11 LTS ` - - August 19, 2021 - - February 20, 2022 - - February 20, 2023 - - * - :doc:`1.10.10 LTS ` - - April 24, 2021 - - February 20, 2022 - - February 20, 2023 - - * - :doc:`1.10.9 LTS ` - - December 30, 2020 - - February 20, 2022 - - February 20, 2023 - - * - :doc:`1.10.8 LTS ` - - October 22, 2020 - - February 20, 2022 - - February 20, 2023 - - * - :doc:`1.10.7 LTS ` - - July 17, 2020 - - February 20, 2022 - - February 20, 2023 - - * - :doc:`1.10.6 LTS ` - - April 20, 2020 - - February 20, 2022 - - February 20, 2023 - - * - :doc:`1.10.5 LTS ` - - January 14, 2020 - - February 20, 2022 - - February 20, 2023 - - * - :ref:`1.10.4 LTS ` - - September 26, 2019 - - February 20, 2022 - - February 20, 2023 - - * - :ref:`1.10.3 LTS ` - - April 1, 2019 - - February 20, 2022 - - February 20, 2023 - - * - :ref:`1.10.2 LTS ` - - October 13, 2018 - - February 20, 2022 - - February 20, 2023 + - December 31, 2025 \ No newline at end of file From 6169d5dd669ad848ba029b620b4028f98bf4246f Mon Sep 17 00:00:00 2001 From: "a.ardeev" Date: Tue, 2 Sep 2025 16:08:32 +0300 Subject: [PATCH 4/6] Release page and EOL page rewritten --- .../{eol_versions.rst => eos_versions.rst} | 13 ++----------- doc/release/index.rst | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 14 deletions(-) rename doc/release/{eol_versions.rst => eos_versions.rst} (76%) diff --git a/doc/release/eol_versions.rst b/doc/release/eos_versions.rst similarity index 76% rename from doc/release/eol_versions.rst rename to doc/release/eos_versions.rst index 63b3c1bb4..4e4bad24d 100644 --- a/doc/release/eol_versions.rst +++ b/doc/release/eos_versions.rst @@ -1,23 +1,14 @@ -EOL versions +EOS versions ============ This page lists release notes for Tarantool versions that have reached -their end of life in accordance with the :doc:`release policy `. +their end of support in accordance with the :doc:`release policy `. See the :doc:`release calendar ` for more information. .. toctree:: :maxdepth: 1 - 2.10.8 - 2.10.7 - 2.10.6 - 2.10.5 - 2.10.4 - 2.10.3 - 2.10.2 - 2.10.1 - 2.10.0 2.8.4 2.8.3 2.8.2 diff --git a/doc/release/index.rst b/doc/release/index.rst index a858d45f6..e2a226e53 100644 --- a/doc/release/index.rst +++ b/doc/release/index.rst @@ -6,9 +6,11 @@ Releases ======== -This section contains release notes for Tarantool versions from 1.6 to 2.11. +This section contains release notes for Tarantool versions from 2.10.0 to 2.11. + +For information about earlier release series, see :doc:`EOS Versions `. For information about newer release series, see the corresponding version's -documentation. +`documentation `_. To download Tarantool releases, check the `Download `_ page. @@ -28,7 +30,16 @@ To learn more, read the :doc:`Compatibility guarantees ` article. :maxdepth: 1 2.11.0 - eol_versions + 2.10.8 + 2.10.7 + 2.10.6 + 2.10.5 + 2.10.4 + 2.10.3 + 2.10.2 + 2.10.1 + 2.10.0 + eos_versions .. toctree:: :maxdepth: 2 From 8122dff66061ff27b09b7b0b013c52dfeb03503f Mon Sep 17 00:00:00 2001 From: "a.ardeev" Date: Tue, 2 Sep 2025 16:26:25 +0300 Subject: [PATCH 5/6] Minor fix --- doc/release/index.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release/index.rst b/doc/release/index.rst index e2a226e53..21fc8892e 100644 --- a/doc/release/index.rst +++ b/doc/release/index.rst @@ -6,7 +6,7 @@ Releases ======== -This section contains release notes for Tarantool versions from 2.10.0 to 2.11. +This section contains links to release notes for Tarantool versions from 2.10.0 to 2.11. For information about earlier release series, see :doc:`EOS Versions `. For information about newer release series, see the corresponding version's From 44210b85736b14d12a48c7b1907cc216d9d7daf6 Mon Sep 17 00:00:00 2001 From: "a.ardeev" Date: Wed, 3 Sep 2025 11:42:30 +0300 Subject: [PATCH 6/6] Updates Release Policy and Legacy release policy --- doc/release/legacy-policy.rst | 24 +++++++++++++----------- doc/release/policy.rst | 32 +++++++++++++++----------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/doc/release/legacy-policy.rst b/doc/release/legacy-policy.rst index dbb7078bb..b5ebf349c 100644 --- a/doc/release/legacy-policy.rst +++ b/doc/release/legacy-policy.rst @@ -1,11 +1,13 @@ Tarantool legacy release policy =============================== +This release policy is actual for Tarantool releases from ``1.6`` and until ``2.8.4`` inclusive. +Starting from the ``2.10.0`` release, a more actual :doc:`release policy ` is applied. -A Tarantool release is identified by three digits, for example, 2.6.2 or 1.10.9: +A Tarantool release is identified by three digits, for example, ``2.6.2`` or ``1.10.9``: * The first digit stands for a MAJOR release series that introduces - some *major changes*. Up to now, there has been only one major release jump + some *major changes*. One of major release jumps, for example, has happened when we delivered the 2.x release series with the SQL support. * The second digit stands for a MINOR release series that is used for introducing new *features*. @@ -22,14 +24,14 @@ So, each MINOR release series goes through a development-maturity life cycle as follows: 1. **Alpha**. Once a quarter, we start off with a new alpha version, - such as 2.3.0, 2.4.0, and so on. This is not what an alpha release usually + such as ``2.3.0``, ``2.4.0``, and so on. This is not what an alpha release usually means in the typical software release life cycle but rather the current trunk version which is under heavy development and can be unstable. The current alpha version always lives in the master branch. 2. **Beta**. When all the features planned are implemented, we fork a new branch from the master branch and tag it as a new beta version. - It contains ``1`` for the PATCH digit, e.g., 2.3.1, 2.4.1, and so on. + It contains ``1`` for the PATCH digit, e.g., ``2.3.1``, ``2.4.1``, and so on. This version cannot be called stable yet (feature freeze has just been done) although there are no known critical regressions in it since the last stable release. @@ -38,11 +40,11 @@ as follows: Finally, after we see our beta version runs successfully in a production or development environment during another quarter while we fix incoming bugs, we declare this version stable. It is tagged with ``2`` for - the PATCH digit, e.g., 2.3.2, 2.4.2, and so on. + the PATCH digit, e.g., ``2.3.2``, ``2.4.2``, and so on. We support such version for 3 months while making another stable release by fixing all bugs found. We release it in a quarter. This last tag - contains ``3`` for the PATCH digit, e.g., 2.3.3, 2.4.3, and so on. + contains ``3`` for the PATCH digit, e.g., ``2.3.3``, ``2.4.3``, and so on. After the tag is set, no new changes are allowed to the release branch, and it is declared deprecated and superseded by a newer MINOR version. @@ -54,7 +56,7 @@ release series: * **LTS (Long Term Support)** is a release series that is supported for 3 years (community) and up to 5 years (paying customers). - Current LTS release series is 1.10, and it receives only PATCH level + Current LTS release series is ``1.10``, and it receives only PATCH level releases. * **Standard** is a release series that is supported only for a few months @@ -92,14 +94,14 @@ by an example of some latest releases and release series: *Support* means that we continue fixing bugs. We add bug fixes simultaneously into the following release series: LTS, last stable, beta, and alpha. If we look at the release diagram above, it means that the bug fixes are to be -added into 1.10, 2.4, 2.5, and 2.6 release series. +added into ``1.10``, ``2.4``, ``2.5``, and ``2.6`` release series. To sum it up, once a quarter we release (see the release diagram above for reference): -* next LTS release, e.g., 1.10.9 -* two stable releases, e.g., 2.5.3 and 2.6.2 -* beta version of the next release series, e.g., 2.7.1. +* next LTS release, e.g., ``1.10.9`` +* two stable releases, e.g., ``2.5.3`` and ``2.6.2`` +* beta version of the next release series, e.g., ``2.7.1.`` In all supported releases, when we find and fix an outstanding CVE/vulnerability, we deliver a patch for that but do not tag a new PATCH level version. diff --git a/doc/release/policy.rst b/doc/release/policy.rst index 86c97b088..97bd10960 100644 --- a/doc/release/policy.rst +++ b/doc/release/policy.rst @@ -6,17 +6,17 @@ Tarantool release policy Summary ------- -The Tarantool release policy is changing to become more clear and intuitive. -The new policy uses a `SemVer-like `__ versioning format, -and introduces a new version lifecycle with more long-time support series. -This document explains the new release policy, versioning rules, and :term:`release series` lifecycle. +The Tarantool release policy is constantly changing to become more clear and intuitive. +The stated policy uses a `SemVer-like `__ versioning format, +and upholds version lifecycle with more long-time support series. This document explains the +Tarantool release policy, versioning rules, and :term:`release series` lifecycle. -The new release policy replaces :doc:`the legacy policy ` +This release policy replaces :doc:`the legacy policy ` for: * The ``2.x.y`` series since the ``2.10.0`` release. Development for this new release starts with version ``2.10.0-beta1``. -* The future ``3.0.0`` series. +* The ``3.0.0`` series. Here are the most significant changes from the legacy release policy: @@ -29,15 +29,13 @@ Here are the most significant changes from the legacy release policy: while ``2.x.y`` had stable releases, but wasn't an LTS series. Now both series are long-term supported. -The topics below describe the new versioning policy in more detail. - Versioning policy ----------------- Release series and versions ~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The new Tarantool release policy is based on having several release series, +The Tarantool release policy is based on having several release series, each with its own lifecycle, pre-release and release versions. .. glossary:: @@ -49,8 +47,6 @@ each with its own lifecycle, pre-release and release versions. A series has a distinct lifecycle and certain compatibility guarantees within itself and with other series. The intended support time for each series is at least two years since the first release. - At the moment when this document is published, there are two release series: series ``1.10`` and series ``2``. - Release version Release version is a Tarantool distribution which is thoroughly tested and ready for production usage. @@ -185,7 +181,7 @@ There are a few types of pre-release versions: 3.0.0-beta1 3.0.0-beta2 - Note that the development of ``2.10.0``, the first release under the new policy, + Note that the development of ``2.10.0``, the first release under the given Policy, starts with version ``2.10.0-beta1``. Release candidate @@ -347,11 +343,13 @@ Then it can proceed with a version sequence like the following: 3.1.0-rc6 3.1.0 (release with new features and, possibly, extra fixed bugs) -Eventually, the support stage stops and the release series comes to the -end of life (EOL) stage. -No new versions are released since then. +Eventually, the release series reaches the end of life (EOL) date and stops +receiving any patches, updates, or feature improvements. Some time after that, +the release series comes to the end of support (EOS) date. After the EOS date, +the series does not receive any technical support. .. note:: - See all currently supported Tarantool versions visualised as :doc:`a calendar ` - or as :ref:`a release lifetime table `. + See all currently supported Tarantool 2.x versions visualised as :doc:`a calendar ` + or as a release lifetime table. Versions that have reached their end of support dates + are listed in the separate :doc:`section `.