Repository: cassandra Updated Branches: refs/heads/trunk 2adf5d1df -> e82ecf87a
Docs: update patch acceptance policies for existing branches Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e82ecf87 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e82ecf87 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e82ecf87 Branch: refs/heads/trunk Commit: e82ecf87a1d093504a763d211a30d5a252fd3a1b Parents: 2adf5d1 Author: Stefan Podkowinski <stefan.podkowin...@1und1.de> Authored: Mon Oct 15 13:17:33 2018 +0200 Committer: Stefan Podkowinski <stefan.podkowin...@1und1.de> Committed: Mon Oct 15 13:19:06 2018 +0200 ---------------------------------------------------------------------- doc/source/development/patches.rst | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e82ecf87/doc/source/development/patches.rst ---------------------------------------------------------------------- diff --git a/doc/source/development/patches.rst b/doc/source/development/patches.rst index 3bab5d0..e8e50f6 100644 --- a/doc/source/development/patches.rst +++ b/doc/source/development/patches.rst @@ -62,18 +62,26 @@ There are currently multiple Cassandra versions maintained in individual branche ======= ====== Version Policy ======= ====== -3.x Tick-tock (see below) -3.0 Bug fixes only -2.2 Bug fixes only +4.0 Code freeze (see below) +3.11 Critical bug fixes only +3.0 Critical bug fixes only +2.2 Critical bug fixes only 2.1 Critical bug fixes only ======= ====== Corresponding branches in git are easy to recognize as they are named ``cassandra-<release>`` (e.g. ``cassandra-3.0``). The ``trunk`` branch is an exception, as it contains the most recent commits from all other branches and is used for creating new branches for future tick-tock releases. -Tick-Tock Releases -"""""""""""""""""" +4.0 Code Freeze +""""""""""""""" -New releases created as part of the `tick-tock release process <http://www.planetcassandra.org/blog/cassandra-2-2-3-0-and-beyond/>`_ will either focus on stability (odd version numbers) or introduce new features (even version numbers). Any code for new Cassandra features you should be based on the latest, unreleased 3.x branch with even version number or based on trunk. +Patches for new features are currently not accepted for 4.0 or any earlier versions. Starting with the code freeze in September, all efforts should focus on stabilizing the 4.0 branch before the first official release. During that time, only the following patches will be considered for acceptance: + + * Bug fixes + * Measurable performance improvements + * Changes not distributed as part of the release such as: + * Testing related improvements and fixes + * Build and infrastructure related changes + * Documentation Bug Fixes """"""""" --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
