saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #29565 from bdrung/2015.8

Browse source 
Fix typos and missing release note
This commit is contained in:
Mike Place 2015-12-09 08:59:20 -07:00
commit f29e0a7021
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/topics/releases/2014.1.6.rst
View file

@ -14,6 +14,7 @@ Version 2014.1.6 is another bugfix release for :doc:`2014.1.0
- Add sqlite3 to esky builds
- Fix ``jobs.active`` output (:issue:`9526`)
- Fix the ``virtual`` grain for Xen (:issue:`13534`)
- Fix _ext_nodes unavailable on master (:issue:`13535`)
- Fix eauth for batch mode (:issue:`9605`)
- Fix force-related issues with ``tomcat`` support (:issue:`12889`)
- Fix KeyError when cloud mapping

2
doc/topics/releases/2015.5.2.rst
View file

@ -207,7 +207,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
* 608da5e modules/lxc: merge resolution
* 27c4689 modules/lxc: more consistent comparsion
* 27c4689 modules/lxc: more consistent comparison
* 07c365a lxc: merge conflict spotted

4
doc/topics/releases/2015.5.3.rst
View file

@ -543,10 +543,10 @@ Changes:
- **PR** `#24791`_: (*rallytime*) Back-port `#24749`_ to 2015.5
@ *2015-06-18T17:43:15Z*
- **PR** `#24749`_: (*obestwalter*) add windows specfic default for multiprocessing
- **PR** `#24749`_: (*obestwalter*) add windows specific default for multiprocessing
| refs: `#24791`_
* 7073a9f Merge pull request `#24791`_ from rallytime/`bp-24749`_
* be43b2b add windows specfic default for multiprocessing
* be43b2b add windows specific default for multiprocessing
- **PR** `#24792`_: (*rallytime*) Back-port `#24757`_ to 2015.5
@ *2015-06-18T15:58:35Z*