hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review comments

Browse Source
This commit is contained in:
Johan Wikman
2018-06-05 10:05:23 +03:00
parent a5377212a6
commit 7e1f795ae9
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Development/branching-and-tagging.md
View File

@ -5,29 +5,28 @@
This document describes how git branches and tags are used in the MaxScale This document describes how git branches and tags are used in the MaxScale
development. development.
## Releases ## Release Numbering
The releases of MaxScale are numbered as `X.Y.Z` where `X` denotes the The releases of MaxScale are numbered as `X.Y.Z` where `X` is the major
major version (currently is `2` and changes very rarely), where `Y` denotes version, `Y` is the minor version, and `Z` is the maintenance version.
the minor version (when changed, implies the introduction of new features),
and where `Z` denotes the maintenance version (when changed, implies that `X` changes very rarely and is currently `2`. `Y` is incremented when new
bugs have been fixed). features are introduced and `Z` is incremented in conjunction with bug
fixes.
When `X` changes, `Y` is reset to 0 and when `Y` changes, `Z` is reset to When `X` changes, `Y` is reset to 0 and when `Y` changes, `Z` is reset to
0. 0.
## Branches ## Branches
## Two kinds
There are two kinds of minor branches in MaxScale; branches named as There are two kinds of minor branches in MaxScale; branches named as
`X.Y`, such as `2.1` and `2.2` and the branch `develop`. `X.Y`, such as `2.1` and `2.2` and the branch `develop`.
The development of the _next_ minor release takes place in `develop`. The development of the _next_ minor release takes place in `develop`.
The only development that takes place in an `X.Z` branch are development The only development that takes place in an `X.Z` branch is related to bug
related to bug fixes. Occasionally, due to explicit customer demand, fixes. Occasionally, due to explicit customer demand, feature development
feature development may also take place. may also take place.
## Maintenance Releases ## Maintenance Releases