Repository : ssh://git@diktynna/doc
On branches: backup-redmine/2023-01-14,main
commit 9198baf80102dffb088d90548aa82a39c36d63d6 Author: Sven Eckelmann sven@narfation.org Date: Sat Dec 17 13:30:37 2022 +0000
doc: batman-adv/Release-todo: switch to non-controversy git branch names
9198baf80102dffb088d90548aa82a39c36d63d6 batman-adv/Release-todo.textile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/batman-adv/Release-todo.textile b/batman-adv/Release-todo.textile index fce7593a..e0640017 100644 --- a/batman-adv/Release-todo.textile +++ b/batman-adv/Release-todo.textile @@ -7,10 +7,10 @@ h2. Release Scheduling
!/attachments/download/706/release_scheduling.svg!
-* master branch is closed whenever net-next is closed -* master branch is released as feature release 20_ _.a after net-next is closed (whenever Linus released a final Linux version) +* main branch is closed whenever net-next is closed +* main branch is released as feature release 20_ _.a after net-next is closed (whenever Linus released a final Linux version) ** actually only the patches which were really submitted should be released (when possible) -* maint branch is released on demand +* stable branch is released on demand ** for example after security issues ** when net.git/Linux was released with important fixes and users cannot switch to new feature release (which is done at the same time)
@@ -28,7 +28,7 @@ h2. Code * [ ] check coverity scan status * [ ] remove dead code (if any) * [ ] check against kernel versions -* [ ] check that maint branch is merged in master +* [ ] check that stable branch is merged in main * [ ] check for "open patches on the ml":https://patchwork.open-mesh.org/project/b.a.t.m.a.n./list/ * [ ] git tag release
@@ -49,7 +49,7 @@ h2. Distributions
h2. Aftershow
-* [ ] Merge current git tag into maint (must be --ff-only or pre-tagging steps were done wrong - git merge --ff-only v20xx.x.x) +* [ ] Merge current git tag into stable (must be --ff-only or pre-tagging steps were done wrong - git merge --ff-only v20xx.x.x) * [ ] close "current version":https://www.open-mesh.org/projects/batman-adv/settings/versions * [ ] add "new upcoming version":https://www.open-mesh.org/projects/batman-adv/versions/new * [ ] Mark issues from "Resolved to Closed":https://www.open-mesh.org/projects/batman-adv/issues?utf8=%E2%9C%93&set_... \ No newline at end of file