etcd/Documentation/branch_management.md

27 lines
1.3 KiB
Markdown
Raw Normal View History

2016-06-27 21:59:59 +03:00
# Branch management
2015-03-14 00:10:25 +03:00
## Guide
2015-03-14 00:10:25 +03:00
2016-02-04 20:36:02 +03:00
* New development occurs on the [master branch][master].
* Master branch should always have a green build!
* Backwards-compatible bug fixes should target the master branch and subsequently be ported to stable branches.
* Once the master branch is ready for release, it will be tagged and become the new stable branch.
2015-03-14 00:10:25 +03:00
2016-02-04 20:36:02 +03:00
The etcd team has adopted a *rolling release model* and supports one stable version of etcd.
2015-03-14 00:10:25 +03:00
### Master branch
2015-06-05 02:41:32 +03:00
The `master` branch is our development branch. All new features land here first.
2015-03-14 00:10:25 +03:00
2016-06-24 03:25:38 +03:00
To try new and experimental features, pull `master` and play with it. Note that `master` may not be stable because new features may introduce bugs.
2015-03-14 00:10:25 +03:00
Before the release of the next stable version, feature PRs will be frozen. We will focus on the testing, bug-fix and documentation for one to two weeks.
### Stable branches
2015-06-05 02:41:32 +03:00
All branches with prefix `release-` are considered _stable_ branches.
2015-03-14 00:10:25 +03:00
2015-06-05 02:41:32 +03:00
After every minor release (http://semver.org/), we will have a new stable branch for that release. We will keep fixing the backwards-compatible bugs for the latest stable release, but not previous releases. The _patch_ release, incorporating any bug fixes, will be once every two weeks, given any patches.
2016-02-04 20:36:02 +03:00
[master]: https://github.com/coreos/etcd/tree/master