diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2018-04-04 14:20:12 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2018-04-04 14:21:04 -0700 |
| commit | 73c80862c814098a021742d34c3c721e5c036e91 (patch) | |
| tree | 623e71b3b2363f11ca3d17a1fd855fa99257bf07 | |
| parent | 5b703a2a5387f7d3e5c65b92fee29d617ee15df1 (diff) | |
| download | ansible-73c80862c814098a021742d34c3c721e5c036e91.tar.gz | |
Update docs and version definitions for the 2.4.4 and 2.5.0 releases
| -rw-r--r-- | docs/docsite/rst/reference_appendices/release_and_maintenance.rst | 13 | ||||
| -rw-r--r-- | packaging/release/vars/versions.yml | 1 |
2 files changed, 9 insertions, 5 deletions
diff --git a/docs/docsite/rst/reference_appendices/release_and_maintenance.rst b/docs/docsite/rst/reference_appendices/release_and_maintenance.rst index 0a812f86a8..c2d155d949 100644 --- a/docs/docsite/rst/reference_appendices/release_and_maintenance.rst +++ b/docs/docsite/rst/reference_appendices/release_and_maintenance.rst @@ -42,9 +42,10 @@ Release status =============== ========================== ================================================= Ansible Release Latest Version Status =============== ========================== ================================================= -devel `2.5`_ (unreleased, trunk) In development -2.4 `2.4.3`_ (2018-01-31) Supported (security **and** general bug fixes) -2.3 `2.3.3`_ (2017-12-20) Supported (security **and** critical bug fixes) +devel `2.6` (unreleased, trunk) In development +2.5 `2.5.0`_ (2018-03-23) Supported (security **and** general bugfixes) +2.4 `2.4.4`_ (2018-01-31) Supported (security **and** critical bug fixes) +2.3 `2.3.3`_ (2017-12-20) Unsupported (end of life) 2.2 `2.2.3`_ (2017-05-09) Unsupported (end of life) 2.1 `2.1.6`_ (2017-06-01) Unsupported (end of life) 2.0 `2.0.2`_ (2016-04-19) Unsupported (end of life) @@ -56,8 +57,10 @@ devel `2.5`_ (unreleased, trunk) In development security and general bug fixes when it is first released, security and critical bug fixes when 2.5 is released, and **only** security fixes once 2.6 is released. -.. _2.5: https://github.com/ansible/ansible/blob/devel/CHANGELOG.md -.. _2.4.3: https://github.com/ansible/ansible/blob/stable-2.4/CHANGELOG.md +.. Comment: devel used to point here but we're currently revamping our changelog process and have no + link to a static changelog for devel _2.6: https://github.com/ansible/ansible/blob/devel/CHANGELOG.md +.. _2.5.0: https://github.com/ansible/ansible/blob/stable-2.5/CHANGELOG.md +.. _2.4.4: https://github.com/ansible/ansible/blob/stable-2.4/CHANGELOG.md .. _2.3.3: https://github.com/ansible/ansible/blob/stable-2.3/CHANGELOG.md .. _2.2.3: https://github.com/ansible/ansible/blob/stable-2.2/CHANGELOG.md .. _2.1.6: https://github.com/ansible/ansible/blob/stable-2.1/CHANGELOG.md diff --git a/packaging/release/vars/versions.yml b/packaging/release/vars/versions.yml index 333f2773a9..ab4bf49dea 100644 --- a/packaging/release/vars/versions.yml +++ b/packaging/release/vars/versions.yml @@ -10,6 +10,7 @@ versions: - "2.4": code_name: "Dancing Days" releases: + - "4": "04-04-2018" - "3": "01-31.2018" - "2": "11-29-2017" - "1": "10-25-2017" |