Merge branch '2014.7' into develop

This commit is contained in:
Colton Myers 2014-08-14 17:39:10 -06:00
commit 0af22fcb19
2 changed files with 5 additions and 1 deletions

View File

@ -149,7 +149,7 @@ copyright = '2014 SaltStack, Inc.'
version = salt.version.__version__
#release = '.'.join(map(str, salt.version.__version_info__))
release = '2014.1.7'
release = '2014.1.10'
spelling_lang = 'en_US'
language = 'en'

View File

@ -22,3 +22,7 @@ Version 2014.1.10 is another bugfix release for :doc:`2014.1.0
- Use a randomized path for temporary files in a salt-cloud deployment
- Clean any stale directories to ensure a fresh copy of salt-ssh during a
deployment
Salt 2014.1.10 fixes security issues documented by CVE-2014-3563: "Insecure
tmp-file creation in seed.py, salt-ssh, and salt-cloud." Upgrading is
recommended.