Merge pull request #31337 from jacobhammons/dot7

Release notes and versioning for 2015.8.7
This commit is contained in:
jacobhammons 2016-02-18 17:20:29 -07:00
commit 98a14f8090
2 changed files with 10 additions and 4 deletions

View file

@ -164,7 +164,7 @@ project = 'Salt'
copyright = '2016 SaltStack, Inc.'
version = salt.version.__version__
latest_release = '2015.8.5' # latest release
latest_release = '2015.8.7' # latest release
previous_release = '2015.5.9' # latest release from previous branch
previous_release_dir = '2015.5' # path on web server for previous branch
build_type = 'latest' # latest, previous, develop, inactive

View file

@ -2,6 +2,12 @@
Salt 2015.8.7 Release Notes
===========================
.. note::
Salt 2015.8.4, 2015.8.5, and 2015.8.7 were all released within a short
period due to regressions found soon after the releases of 2015.8.4 and
2015.8.5. These release notes contain all of the changes since 2015.8.3 to
make it easier to see everything that has changed recently.
Changes for v2015.8.4..v2015.8.7
--------------------------------
@ -85,7 +91,7 @@ Changes:
.. _`#31111`: https://github.com/saltstack/salt/pull/31111
--------------------------
**2015.8.5 Release Notes**
.. include:: 2015.8.5.rst
:start-line: 6`
.. include:: 2015.8.4.rst
:start-line: 17