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 #45747 from SteffenKockel/2017.7

Browse source 
Fix typos
This commit is contained in:
Nicole Thomas 2018-01-29 08:53:27 -05:00 • committed by GitHub
commit fe636f53f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/cloud/deploy/bootstrap-salt.sh
View file

@ -95,7 +95,7 @@ echoinfo() {
#--- FUNCTION -------------------------------------------------------------------------------------------------------
# NAME: echowarn
# DESCRIPTION: Echo warning informations to stdout.
# DESCRIPTION: Echo warning information to stdout.
#----------------------------------------------------------------------------------------------------------------------
echowarn() {
printf "${YC} * WARN${EC}: %s\n" "$@";
@ -338,7 +338,7 @@ __usage() {
-U If set, fully upgrade the system prior to bootstrapping Salt
-I If set, allow insecure connections while downloading any files. For
example, pass '--no-check-certificate' to 'wget' or '--insecure' to
'curl'. On Debian and Ubuntu, using this option with -U allows to obtain
'curl'. On Debian and Ubuntu, using this option with -U allows obtaining
GnuPG archive keys insecurely if distro has changed release signatures.
-F Allow copied files to overwrite existing (config, init.d, etc)
-K If set, keep the temporary files in the temporary directories specified

2
salt/modules/junos.py
View file

@ -144,7 +144,7 @@ def rpc(cmd=None, dest=None, format='xml', **kwargs):
The rpc to be executed. (default = None)
Optional
* dest:
Destination file where the rpc ouput is stored. (default = None)
Destination file where the rpc output is stored. (default = None)
Note that the file will be stored on the proxy minion. To push the
files to the master use the salt's following execution module:
:py:func:`cp.push <salt.modules.cp.push>`

4
salt/modules/napalm_network.py
View file

@ -99,7 +99,7 @@ def _filter_dict(input_dict, search_key, search_value):
def _explicit_close(napalm_device):
'''
Will explicitely close the config session with the network device,
Will explicily close the config session with the network device,
when running in a now-always-alive proxy minion or regular minion.
This helper must be used in configuration-related functions,
as the session is preserved and not closed before making any changes.
@ -137,7 +137,7 @@ def _config_logic(napalm_device,
# then the decorator will make sure that
# if not proxy (when the connection is always alive)
# and the `inherit_napalm_device` is set,
# `napalm_device` will be overriden.
# `napalm_device` will be overridden.
# See `salt.utils.napalm.proxy_napalm_wrap` decorator.
loaded_result['already_configured'] = False