summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarel Zak2007-10-22 10:47:46 +0200
committerKarel Zak2007-10-25 21:50:59 +0200
commit102cb99e47eaed5ab86250c86268c5645f25f7cc (patch)
tree0a52ffc141133a6b65c89d4d605cc334dfc03959
parentmkswap: possible to crash with SELinux relabeling support (diff)
downloadkernel-qcow2-util-linux-102cb99e47eaed5ab86250c86268c5645f25f7cc.tar.gz
kernel-qcow2-util-linux-102cb99e47eaed5ab86250c86268c5645f25f7cc.tar.xz
kernel-qcow2-util-linux-102cb99e47eaed5ab86250c86268c5645f25f7cc.zip
docs: add info about .bugfix releases and branches
Signed-off-by: Karel Zak <kzak@redhat.com>
-rw-r--r--README3
-rw-r--r--README.devel12
2 files changed, 10 insertions, 5 deletions
diff --git a/README b/README
index b4b0c1dd6..103fd5398 100644
--- a/README
+++ b/README
@@ -42,11 +42,12 @@ VERSION SCHEMA:
Standard releases:
- <major>.<minor>.<maint>
+ <major>.<minor>[.<maint>[.<bugfix>]]
major = fatal and deep changes
minor = typical release with new fetures
maint = maintenance releases; bug fixes only
+ bugfix = unplanned releases for critical/security bugs
Development releases:
diff --git a/README.devel b/README.devel
index 25ad051da..621bddc92 100644
--- a/README.devel
+++ b/README.devel
@@ -51,8 +51,14 @@ SCM (source code management):
git clone git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git util-linux-ng
- * maintenance (stable) branch(es)
- - created for every <major>.<minor> release, branch name: stable/v<major>.<minor>
+ * maintenance (stable) branch
+ - created for every <major>.<minor> release
+ - branch name: stable/v<major>.<minor>
+
+ * bugfix branch
+ - created for <major>.<minor>.<maint> release for critical/security bugs only
+ - this branch is optional
+ - branch name: stable/v<major>.<minor>.<maint>
* master branch
- the status of this branch is: "it works for me". It means useful
@@ -64,6 +70,4 @@ SCM (source code management):
* A new tag object is created for:
- every release, tag name: v<version>
- - every public snapshot, tag name: s<version>-YYYYMMDD
-