mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Fix typo an dont -> don't
This commit is contained in:
parent
3624935d32
commit
45fcc7d339
11 changed files with 11 additions and 11 deletions
|
@ -956,7 +956,7 @@ Changes:
|
|||
* a570d7f Merge pull request `#24566`_ from jayeshka/rdp_states-unit-test
|
||||
* 273b994 adding states/rdp unit test case.
|
||||
|
||||
- **PR** `#24551`_: (*joejulian*) 2015.5 dont pollute environment
|
||||
- **PR** `#24551`_: (*joejulian*) 2015.5 don't pollute environment
|
||||
@ *2015-06-11T02:13:06Z*
|
||||
|
||||
- **ISSUE** `#24480`_: (*kiorky*) [CRITICAL] [2015.5] tls breaks tzinfo
|
||||
|
|
|
@ -1051,7 +1051,7 @@ Changes:
|
|||
- **PR** `#25392`_: (*rallytime*) Back-port `#25256`_ to 2015.5
|
||||
@ *2015-07-14T03:25:13Z*
|
||||
|
||||
- **PR** `#25256`_: (*yanatan16*) Dont assume source_hash exists
|
||||
- **PR** `#25256`_: (*yanatan16*) Don't assume source_hash exists
|
||||
| refs: `#25392`_
|
||||
|
||||
- **PR** `#25398`_: (*twangboy*) Fix date
|
||||
|
|
|
@ -1049,7 +1049,7 @@ Changes:
|
|||
- **PR** `#25392`_: (*rallytime*) Back-port `#25256`_ to 2015.5
|
||||
@ *2015-07-14T03:25:13Z*
|
||||
|
||||
- **PR** `#25256`_: (*yanatan16*) Dont assume source_hash exists
|
||||
- **PR** `#25256`_: (*yanatan16*) Don't assume source_hash exists
|
||||
| refs: `#25392`_
|
||||
|
||||
- **PR** `#25398`_: (*twangboy*) Fix date
|
||||
|
|
|
@ -7,7 +7,7 @@ running salt as normal user tutorial
|
|||
Running Salt functions as non root user
|
||||
=======================================
|
||||
|
||||
If you dont want to run salt cloud as root or even install it you can
|
||||
If you don't want to run salt cloud as root or even install it you can
|
||||
configure it to have a virtual root in your working directory.
|
||||
|
||||
The salt system uses the ``salt.syspath`` module to find the variables
|
||||
|
|
|
@ -378,7 +378,7 @@ def _edit_existing_network_adapter(network_adapter, new_network_name, adapter_ty
|
|||
else:
|
||||
log.debug("Changing type of '{0}' from '{1}' to '{2}'".format(network_adapter.deviceInfo.label, type(network_adapter).__name__.rsplit(".", 1)[1][7:].lower(), adapter_type))
|
||||
else:
|
||||
# If type not specified or does not match, dont change adapter type
|
||||
# If type not specified or does not match, don't change adapter type
|
||||
if adapter_type:
|
||||
log.error("Cannot change type of '{0}' to '{1}'. Not changing type".format(network_adapter.deviceInfo.label, adapter_type))
|
||||
edited_network_adapter = network_adapter
|
||||
|
|
|
@ -1112,7 +1112,7 @@ class LazyLoader(salt.utils.lazy.LazyDict):
|
|||
mod = zipimporter(fpath).load_module(name)
|
||||
else:
|
||||
desc = self.suffix_map[suffix]
|
||||
# if it is a directory, we dont open a file
|
||||
# if it is a directory, we don't open a file
|
||||
if suffix == '':
|
||||
mod = imp.load_module(
|
||||
'{0}.{1}.{2}.{3}'.format(
|
||||
|
|
|
@ -166,7 +166,7 @@ def _set_value(value):
|
|||
'''
|
||||
|
||||
logger.error(value)
|
||||
#dont continue if already an acceptable data-type
|
||||
#don't continue if already an acceptable data-type
|
||||
if isinstance(value, bool) or isinstance(value, dict) or isinstance(value, list):
|
||||
return value
|
||||
|
||||
|
|
|
@ -56,7 +56,7 @@ def __execute_cmd(name, xml):
|
|||
|
||||
try:
|
||||
for i in ET.fromstring(''.join(cmd['stdout'].splitlines()[3:-1])):
|
||||
# Make sure dict keys dont collide
|
||||
# Make sure dict keys don't collide
|
||||
if ret[name.replace('_', ' ')].get(i.tag, False):
|
||||
ret[name.replace('_', ' ')].update(
|
||||
{i.tag + '_' + str(id_num): i.attrib}
|
||||
|
|
|
@ -297,7 +297,7 @@ def get_enabled():
|
|||
if name in units:
|
||||
continue
|
||||
# performance; if the legacy initscript doesnt exists,
|
||||
# dont contiue up with systemd query
|
||||
# don't contiue up with systemd query
|
||||
if not _service_is_sysv(name):
|
||||
continue
|
||||
if _sysv_is_enabled(name):
|
||||
|
|
|
@ -498,7 +498,7 @@ class BaseSaltAPIHandler(tornado.web.RequestHandler, SaltClientsMixIn): # pylin
|
|||
'application/json': json.loads,
|
||||
'application/x-yaml': yaml.safe_load,
|
||||
'text/yaml': yaml.safe_load,
|
||||
# because people are terrible and dont mean what they say
|
||||
# because people are terrible and don't mean what they say
|
||||
'text/plain': json.loads
|
||||
}
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ This runner helps create encrypted passwords that can be included in pillars.
|
|||
:depends: libnacl, https://github.com/saltstack/libnacl
|
||||
|
||||
This is often useful if you wish to store your pillars in source control or
|
||||
share your pillar data with others that you trust. I dont advise making your pillars public
|
||||
share your pillar data with others that you trust. I don't advise making your pillars public
|
||||
regardless if they are encrypted or not.
|
||||
|
||||
The following configurations can be defined in the master config
|
||||
|
|
Loading…
Add table
Reference in a new issue