Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Maintenance] Update docs with v1.6 #10701

Merged
merged 1 commit into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
| Q | A
| --------------- | -----
| Branch? | 1.4, 1.5 or master <!-- see the comment below -->
| Branch? | 1.4, 1.5, 1.6 or master <!-- see the comment below -->
| Bug fix? | no/yes
| New feature? | no/yes
| BC breaks? | no/yes
Expand All @@ -9,7 +9,7 @@
| License | MIT

<!--
- Bug fixes must be submitted against the 1.4 or 1.5 branch (the lowest possible)
- Bug fixes must be submitted against the 1.4, 1.5 or 1.6 branch (the lowest possible)
- Features and deprecations must be submitted against the master branch
- Make sure that the correct base branch is set
-->
4 changes: 2 additions & 2 deletions docs/contributing/organization/release-process.rst
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,15 @@ Past Releases
+---------+--------------------+--------------------+--------------------+-----------------------+
| 1.5 | May 10, 2019 | Jan 10, 2020 | Sep 10, 2020 | Fully supported |
+---------+--------------------+--------------------+--------------------+-----------------------+
| 1.6 | Aug 29, 2019 | Apr 29, 2020 | Dec 29, 2020 | Fully supported |
+---------+--------------------+--------------------+--------------------+-----------------------+

Future Releases
---------------

+---------+----------------------+------------------------+--------------------+
| Version | Development starts | Stabilization starts | Release date |
+=========+======================+========================+====================+
| 1.6 | Early May 2019 | Mid Aug 2019 | Late Aug 2019 |
+---------+----------------------+------------------------+--------------------+
| 1.7 | Early Sep 2019 | Early Feb 2020 | Late Feb 2020 |
+---------+----------------------+------------------------+--------------------+

Expand Down