Commit 718d42e9 authored by totten's avatar totten

README - Fill in more dates. Add header. Tweak prose.

parent 972adbb8
......@@ -7,11 +7,11 @@ index of release-plans and the release invitations.
| Name | Development/Alpha Period | RC/Beta Period | Release Date | Stable Period |
| ------ | ------------------------ | --------------- |----------------| ------------- |
| 5.15.x | May 2019 | Jun 2019 | Jul ?, 2019 | Jul 2019 |
| 5.14.x | Apr 2019 | May 2019 | Jun ?, 2019 | Jun 2019 |
| 5.13.x | Mar 2019 | Apr 2019 | May ?, 2019 | May 2019 plus [ESR](https://civicrm.org/blog/josh/civicrm-version-57-candidate-for-extended-security-release) |
| 5.12.x | Feb 2019 | Mar 2019 | Apr ?, 2019 | Apr 2019 |
| 5.11.x | Jan 2019 | Feb 2019 | Mar ?, 2019 | Mar 2019 |
| 5.15.x | May 2019 | Jun 2019 | Jul 3, 2019 | Jul 2019 |
| 5.14.x | Apr 2019 | May 2019 | Jun 5, 2019 | Jun 2019 |
| 5.13.x | Mar 2019 | Apr 2019 | May 1, 2019 | May 2019 plus [ESR](https://civicrm.org/blog/josh/civicrm-version-57-candidate-for-extended-security-release) |
| 5.12.x | Feb 2019 | Mar 2019 | Apr 3, 2019 | Apr 2019 |
| 5.11.x | Jan 2019 | Feb 2019 | Mar 6, 2019 | Mar 2019 |
| 5.10.x | Dec 2018 | Jan 2019 | Feb 7, 2019 | Feb 2019 |
| 5.9.x | Nov 2018 | Dec 2018 | Jan 2, 2019 | Jan 2019 |
| 5.8.x | Oct 2018 | Nov 2018 | Dec 5, 2018 | Dec 2018 |
......@@ -26,16 +26,18 @@ index of release-plans and the release invitations.
Unless stated otherwise, months are generally bounded by the first Wed. Thus, development in May 2018 actually lasts from 2-May-18 to 6-Jun-18.
## Release Lifecycle
Each period has a different policy on accepting changes:
* During the *Development/Alpha* period, changes are accepted on the `master` branch. These should generally be bugfixes, API improvements,
or small features -- but anything that passes the [review process](https://docs.civicrm.org/dev/en/latest/standards/review/) may be accepted.
The branch is internally numbered as `5.x.alpha1`.
* During the *RC/Beta* period, a new branch (e.g. `5.0` or `5.1` or `5.2`) is created. There is a general freeze on scope.
However, fixes for recent regressions may still be accepted. The branch is internally numbered as `5.x.beta1`. (In some
* During the *RC/Beta* period, a new branch (e.g. `5.0` or `5.1` or `5.2`) is created. There is a general freeze on scope. However, fixes for
recent regressions may still be accepted, and they will merge-forward to `master`. The branch is internally numbered as `5.x.beta1`. (In some
unusual circumstances, it could be incremented to `5.x.beta2`, etc.)
* On the *Release Date*, the first `5.x.0` version is released.
* During the *Stable* period, patches are not generally accepted. However, there may be patches in the following cases:
* On the *Release Date*, the `5.x.0` version is tagged and released.
* During the *Stable* period, patches are not generally accepted, and there is no automatic merging. There may be patches in the following cases:
* If a recent regression is fixed and approved for the concurrent RC/beta, then it may be back-ported to the stable.
These fixes are generally released ASAP, but this is left to the discretion the maintenance/release teams.
* The security team may approve patches for a security release. Security releases may only be published on the
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment