From 7e5071856ce29d767c81acee3f4b2c07ae95940a Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 10 Feb 2021 13:47:21 +0100 Subject: [PATCH] doc: update the documentation - mention `stable-6.0` requirements. - update some patterns. Signed-off-by: Guillaume Abrioux --- docs/source/dev/index.rst | 12 ++++++------ docs/source/index.rst | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/source/dev/index.rst b/docs/source/dev/index.rst index e445a1600..0ce3305ae 100644 --- a/docs/source/dev/index.rst +++ b/docs/source/dev/index.rst @@ -69,7 +69,7 @@ For example: .. code-block:: none - jenkins test luminous-ansible2.3-journal_collocation + jenkins test centos-non_container-all_daemons Backporting changes ------------------- @@ -81,9 +81,9 @@ If a change should be backported to a ``stable-*`` Git branch: - Determine the latest available stable branch: ``git branch -r --list "origin/stable-[0-9].[0-9]" | sort -r | sed 1q`` - Create a new local branch for your pull request, based on the stable branch: - ``git checkout --no-track -b my-backported-change origin/stable-3.0`` + ``git checkout --no-track -b my-backported-change origin/stable-5.0`` - Cherry-pick your change: ``git cherry-pick -x (your-sha1)`` -- Create a new pull request against the ``stable-3.0`` branch. +- Create a new pull request against the ``stable-5.0`` branch. - Ensure that your pull requests's title has the prefix "backport:", so it's clear to reviewers what this is about. - Add a comment in your backport pull request linking to the original (master) pull request. @@ -96,7 +96,7 @@ stable branch with your change. For example: .. code-block:: console - $ git checkout stable-3.0 + $ git checkout stable-5.0 $ git pull --ff-only - $ git tag v3.0.12 - $ git push origin v3.0.12 + $ git tag v5.0.12 + $ git push origin v5.0.12 diff --git a/docs/source/index.rst b/docs/source/index.rst index b6f0fe9ec..6e49224ce 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -81,6 +81,8 @@ The ``master`` branch should be considered experimental and used with caution. - ``stable-5.0`` Supports Ceph version ``octopus``. This branch requires Ansible version ``2.9``. +- ``stable-6.0`` Supports Ceph version ``pacific``. This branch requires Ansible version ``2.9``. + - ``master`` Supports the master branch of Ceph. This branch requires Ansible version ``2.9``. .. NOTE:: ``stable-3.0`` and ``stable-3.1`` branches of ceph-ansible are deprecated and no longer maintained. -- 2.47.3