mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Fix the wrong "allow to do" phrase
"allow to do" is not a valid English phrase. Either use a gerund (allow doing) or add a patient/object (allow someone to do).
This commit is contained in:
parent
859b6b46a6
commit
89dcb66310
10 changed files with 16 additions and 15 deletions
|
@ -451,10 +451,11 @@ only the cache for the mine system.
|
|||
|
||||
Default: 0
|
||||
|
||||
The number of minions the master should allow to connect. Use this to accommodate
|
||||
the number of minions per master if you have different types of hardware serving
|
||||
your minions. The default of ``0`` means unlimited connections. Please note, that
|
||||
this can slow down the authentication process a bit in large setups.
|
||||
The maximum number of minion connections allowed by the master. Use this to
|
||||
accommodate the number of minions per master if you have different types of
|
||||
hardware serving your minions. The default of ``0`` means unlimited connections.
|
||||
Please note, that this can slow down the authentication process a bit in large
|
||||
setups.
|
||||
|
||||
.. code-block:: yaml
|
||||
|
||||
|
|
|
@ -288,7 +288,7 @@ success condition, the test function is simply named ``test_get()``. As
|
|||
described, the single function call parameter, ``name`` is mocked with
|
||||
``net.ipv4.ip_forward`` and ``__salt__['cmd.run']`` is replaced by a MagicMock
|
||||
function object. We are only interested in the return value of
|
||||
``__salt__['cmd.run']``, which MagicMock allows to be specified via
|
||||
``__salt__['cmd.run']``, which MagicMock allows us by specifying via
|
||||
``return_value=1``. Finally, the test itself tests for equality between the
|
||||
return value of ``get()`` and the expected return of ``1``. This assertion is
|
||||
expected to succeed because ``get()`` will determine its return value from
|
||||
|
|
|
@ -77,7 +77,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
|
|||
|
||||
* 2d9aa2b Avoid shadowing variables in lxc module
|
||||
|
||||
* 792e102 Allow to override profile options in lxc.cloud_init_interface
|
||||
* 792e102 Allow overriding profile options in lxc.cloud_init_interface
|
||||
|
||||
* 42bd64b Return changes on successful lxc.create from salt-cloud
|
||||
|
||||
|
|
|
@ -564,7 +564,7 @@ Extended Changelog Courtesy of Todd Stansell (https://github.com/tjstansell/salt
|
|||
|
||||
* 2d9aa2b Avoid shadowing variables in lxc module
|
||||
|
||||
* 792e102 Allow to override profile options in lxc.cloud_init_interface
|
||||
* 792e102 Allow overriding profile options in lxc.cloud_init_interface
|
||||
|
||||
* 42bd64b Return changes on successful lxc.create from salt-cloud
|
||||
|
||||
|
|
|
@ -51,7 +51,7 @@ Changes:
|
|||
- **ISSUE** `#25192`_: (*deuscapturus*) 2015.5.2 boto_cloudwatch_alarm.present not working.
|
||||
| refs: `#26290`_
|
||||
|
||||
- **PR** `#26288`_: (*bbinet*) allow to delete grains which value is False
|
||||
- **PR** `#26288`_: (*bbinet*) allow deleting grains which value is False
|
||||
@ *2015-08-13T18:24:36Z*
|
||||
|
||||
- **PR** `#26263`_: (*rallytime*) Don't make changes when test=True for openstack present/absent funcs
|
||||
|
|
|
@ -51,7 +51,7 @@ Changes:
|
|||
- **ISSUE** `#25192`_: (*deuscapturus*) 2015.5.2 boto_cloudwatch_alarm.present not working.
|
||||
| refs: `#26290`_
|
||||
|
||||
- **PR** `#26288`_: (*bbinet*) allow to delete grains which value is False
|
||||
- **PR** `#26288`_: (*bbinet*) allow deleting grains which value is False
|
||||
@ *2015-08-13T18:24:36Z*
|
||||
|
||||
- **PR** `#26263`_: (*rallytime*) Don't make changes when test=True for openstack present/absent funcs
|
||||
|
|
|
@ -3,7 +3,7 @@ From: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
|
|||
Date: Fri, 11 Apr 2014 14:43:02 +0200
|
||||
Subject: [PATCH] Allow systemd units no provided by unit files to be handled.
|
||||
|
||||
This allows to query status, start, stop, restart and list units that
|
||||
This allows querying status, start, stop, restart and list units that
|
||||
are not actually provided by unit files. Such units cannot be
|
||||
enabled/disabled and that's why those actions still prefer the
|
||||
"list-unit-files" output over "list-units".
|
||||
|
|
|
@ -714,8 +714,8 @@ VALID_OPTS = {
|
|||
# Instructs the salt CLI to print a summary of a minion reponses before returning
|
||||
'cli_summary': bool,
|
||||
|
||||
# The number of minions the master should allow to connect. Can have performance implications
|
||||
# in large setups.
|
||||
# The maximum number of minion connections allowed by the master. Can have performance
|
||||
# implications in large setups.
|
||||
'max_minions': int,
|
||||
|
||||
|
||||
|
|
|
@ -1064,13 +1064,13 @@ def encrypt(user=None,
|
|||
result = gpg.encrypt(text, recipients, passphrase=gpg_passphrase)
|
||||
elif filename:
|
||||
if GPG_1_3_1:
|
||||
# This version does not allows us to encrypt using the
|
||||
# This version does not allow us to encrypt using the
|
||||
# file stream # have to read in the contents and encrypt.
|
||||
with salt.utils.flopen(filename, 'rb') as _fp:
|
||||
_contents = _fp.read()
|
||||
result = gpg.encrypt(_contents, recipients, passphrase=gpg_passphrase, output=output)
|
||||
else:
|
||||
# This version allows to encrypt using the stream
|
||||
# This version allows encrypting the file stream
|
||||
with salt.utils.flopen(filename, 'rb') as _fp:
|
||||
if output:
|
||||
result = gpg.encrypt_file(_fp, recipients, passphrase=gpg_passphrase, output=output, sign=sign)
|
||||
|
|
|
@ -219,7 +219,7 @@ class SerializerExtension(Extension, object):
|
|||
|
||||
**Format filters**
|
||||
|
||||
Allows to jsonify or yamlify any data structure. For example, this dataset:
|
||||
Allows jsonifying or yamlifying any data structure. For example, this dataset:
|
||||
|
||||
.. code-block:: python
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue