valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix typos of compatibility

Browse Source
This commit is contained in:
Benjamin Drung 2015-11-04 10:53:00 +01:00
parent 46a5a9b073
commit 14d2a16f74
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/topics/releases/2015.5.1.rst
View File

@ -513,7 +513,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
* e48982f Fix version checking in psutil_compat * e48982f Fix version checking in psutil_compat
* 93ee411 Create compatability psutil. psutil 3.0 drops 1.0 API, but we still support old psutil versions. * 93ee411 Create compatibility psutil. psutil 3.0 drops 1.0 API, but we still support old psutil versions.
- **PR** `#23782`_: (*terminalmage*) Replace "command -v" with "which" and get rid of spurious log messages - **PR** `#23782`_: (*terminalmage*) Replace "command -v" with "which" and get rid of spurious log messages
@ *2015-05-16T04:03:10Z* @ *2015-05-16T04:03:10Z*
@ -968,7 +968,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
* 73cfda7 Remove unused import * 73cfda7 Remove unused import
* 52b68d6 Use the zip_longest from six module for python 3 compatiblity * 52b68d6 Use the zip_longest from six module for python 3 compatibility
* 18d5ff9 Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes * 18d5ff9 Fix salt.state.file._unify_sources_and_hashes when sources is used without sources_hashes

2
salt/states/reg.py
View File

@ -115,7 +115,7 @@ def present(name,
- HKEY_USERS or HKU - HKEY_USERS or HKU
:param str value: Deprecated. Use vname and vdata instead. Included here for :param str value: Deprecated. Use vname and vdata instead. Included here for
backwards compatability. backwards compatibility.
:param str vname: The name of the value you'd like to create beneath the :param str vname: The name of the value you'd like to create beneath the
Key. If this parameter is not passed it will assume you want to set the Key. If this parameter is not passed it will assume you want to set the

2
salt/utils/http.py
View File

@ -579,7 +579,7 @@ def get_ca_bundle(opts=None):
# RedHat is also very common # RedHat is also very common
'/etc/pki/tls/certs/ca-bundle.crt', '/etc/pki/tls/certs/ca-bundle.crt',
'/etc/pki/tls/certs/ca-bundle.trust.crt', '/etc/pki/tls/certs/ca-bundle.trust.crt',
# RedHat's link for Debian compatability # RedHat's link for Debian compatibility
'/etc/ssl/certs/ca-bundle.crt', '/etc/ssl/certs/ca-bundle.crt',
# Suse has an unusual path # Suse has an unusual path
'/var/lib/ca-certificates/ca-bundle.pem', '/var/lib/ca-certificates/ca-bundle.pem',