saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

remove repetitive words

Browse source 
Signed-off-by: carrychair <linghuchong404@gmail.com>
This commit is contained in:
carrychair 2024-03-09 17:25:59 +08:00 • committed by Daniel Wozniak
parent aaad0d2ecf
commit e4c1da4323
9 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/topics/development/salt_extensions.rst
View file

@ -27,7 +27,7 @@ almost exclusively maintained by external corporations – if these corporations
documentation outlining transfer of ownership it can be handled on a case-by-case basis. The
community modules can be hosted either in individual or corporate source control systems,
alternatively they can also be hosted in the community run Salt Extensions Github organization,
that will operate like the the Salt Formulas Github organization.
that will operate like the Salt Formulas Github organization.
The criteria to determine which category to place modules in will follow these rules:
## Core Modules

2
doc/topics/releases/2017.7.3.rst
View file

@ -1768,7 +1768,7 @@ Changelog for v2017.7.2..v2017.7.3
* 04b97bcfad Merge pull request `#44663`_ from whytewolf/ZD1777_ensure_understanding_of_minion_config_over_grains_file
* c9122e4b85 fixed pylint error, and updated description on at the top the the module and state.
* c9122e4b85 fixed pylint error, and updated description on at the top the module and state.
* 7fb208b5ad Update note in topics/grains to reflect that not all grains are ignored. only those set in the minion config

2
doc/topics/releases/2019.2.1.rst
View file

@ -5680,7 +5680,7 @@ Changelog for v2019.2.0..v2019.2.1
* 41ae390 Merge pull request `#51231`_ from terminalmage/issue51056
* 4a61477 Clarify documentation for the the gitfs "all_saltenvs" config param
* 4a61477 Clarify documentation for the gitfs "all_saltenvs" config param
* 0574476 Merge branch '2018.3' into fix_test_pkg

2
pkg/windows/nsis/installer/Salt-Minion-Setup.nsi
View file

@ -284,7 +284,7 @@ Function pageMinionConfig
`hostname` no changes will be made."
${Else}
${NSD_CreateLabel} 0 75u 100% 60u \
"Clicking `Install` will backup the the existing minion config \
"Clicking `Install` will backup the existing minion config \
file and minion.d directories. The values above will be used in \
the custom config.$\n\
$\n\

2
salt/transport/base.py
View file

@ -407,7 +407,7 @@ class PublishClient(Transport):
self, port=None, connect_callback=None, disconnect_callback=None, timeout=None
):
"""
Create a network connection to the the PublishServer or broker.
Create a network connection to the PublishServer or broker.
"""
raise NotImplementedError

2
salt/utils/process.py
View file

@ -208,7 +208,7 @@ def get_process_info(pid=None):
# pid_exists can have false positives
# for example Windows reserves PID 5 in a hack way
# another reasons is the the process requires kernel permissions
# another reasons is the process requires kernel permissions
try:
raw_process_info.status()
except psutil.NoSuchProcess:

6
tests/pytests/unit/modules/test_aptpkg.py
View file

@ -1181,7 +1181,7 @@ def test__expand_repo_def():
# Make sure last character in of the URI is still a /
assert sanitized["uri"][-1] == "/"
# Pass the architecture and make sure it is added the the line attribute
# Pass the architecture and make sure it is added the line attribute
repo = "deb http://cdn-aws.deb.debian.org/debian/ stretch main\n"
sanitized = aptpkg._expand_repo_def(
os_name="debian",
@ -1220,7 +1220,7 @@ def test__expand_repo_def_cdrom():
# Make sure last character in of the URI is still a /
assert sanitized["uri"][-1] == "/"
# Pass the architecture and make sure it is added the the line attribute
# Pass the architecture and make sure it is added the line attribute
repo = "deb http://cdn-aws.deb.debian.org/debian/ stretch main\n"
sanitized = aptpkg._expand_repo_def(
os_name="debian",
@ -1258,7 +1258,7 @@ def test_expand_repo_def_cdrom():
# Make sure last character in of the URI is still a /
assert sanitized["uri"][-1] == "/"
# Pass the architecture and make sure it is added the the line attribute
# Pass the architecture and make sure it is added the line attribute
repo = "deb http://cdn-aws.deb.debian.org/debian/ stretch main\n"
sanitized = aptpkg._expand_repo_def(
os_name="debian", repo=repo, file=source_file, architectures="amd64"

10
tests/pytests/unit/states/test_win_wua.py
View file

@ -307,7 +307,7 @@ def test_installed(update_records, update_records_identity):
mock_wua.search = MagicMock()
# Mocks the number of updates found.
mock_wua.search().count.return_value = 1
# Mocks the the updates collection object
# Mocks the updates collection object
mock_wua.search().updates = update_search_obj
# This mocks the updates collection in the install variable. This will
@ -414,7 +414,7 @@ def test_installed_test_mode(update_records, update_records_identity):
mock_wua.search = MagicMock()
# Mocks the number of updates found.
mock_wua.search().count.return_value = 1
# Mocks the the updates collection object
# Mocks the updates collection object
mock_wua.search().updates = update_search_obj
# This mocks the updates collection in the install variable. This will
@ -476,7 +476,7 @@ def test_installed_already_installed(update_records, update_records_identity):
mock_wua.search = MagicMock()
# Mocks the number of updates found.
mock_wua.search().count.return_value = 1
# Mocks the the updates collection object
# Mocks the updates collection object
mock_wua.search().updates = update_search_obj
# This mocks the updates collection in the install variable. This will
@ -569,7 +569,7 @@ def test_removed(update_records, update_records_identity):
mock_wua.search = MagicMock()
# Mocks the number of updates found.
mock_wua.search().count.return_value = 1
# Mocks the the updates collection object
# Mocks the updates collection object
mock_wua.search().updates = update_search_obj
# This mocks the updates collection in the uninstall variable. This will
@ -645,7 +645,7 @@ def test_removed_test_mode(update_records, update_records_identity):
mock_wua.search = MagicMock()
# Mocks the number of updates found.
mock_wua.search().count.return_value = 1
# Mocks the the updates collection object
# Mocks the updates collection object
mock_wua.search().updates = update_search_obj
# This mocks the updates collection in the install variable. This will

8
tests/pytests/unit/test_request_channel.py
View file

@ -662,7 +662,7 @@ async def test_req_chan_decode_data_dict_entry_v2(minion_opts, master_opts, pki_
client.transport.send = mocksend
# Note the 'ver' value in 'load' does not represent the the 'version' sent
# Note the 'ver' value in 'load' does not represent the 'version' sent
# in the top level of the transport's message.
load = {
"id": target,
@ -738,7 +738,7 @@ async def test_req_chan_decode_data_dict_entry_v2_bad_nonce(
client.transport.send = mocksend
# Note the 'ver' value in 'load' does not represent the the 'version' sent
# Note the 'ver' value in 'load' does not represent the 'version' sent
# in the top level of the transport's message.
load = {
"id": target,
@ -830,7 +830,7 @@ async def test_req_chan_decode_data_dict_entry_v2_bad_signature(
client.transport.send = mocksend
# Note the 'ver' value in 'load' does not represent the the 'version' sent
# Note the 'ver' value in 'load' does not represent the 'version' sent
# in the top level of the transport's message.
load = {
"id": target,
@ -929,7 +929,7 @@ async def test_req_chan_decode_data_dict_entry_v2_bad_key(
client.transport.send = mocksend
# Note the 'ver' value in 'load' does not represent the the 'version' sent
# Note the 'ver' value in 'load' does not represent the 'version' sent
# in the top level of the transport's message.
load = {
"id": target,