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 #49313 from rallytime/bp-49236

Browse source 
Back-port #49236 to 2018.3.3
This commit is contained in:
Nicole Thomas 2018-08-24 16:59:15 -04:00 • committed by GitHub
commit 64d7b0e4c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/utils/minions.py
View file

@ -706,7 +706,7 @@ class CkMinions(object):
'S': 'ipcidr',
'E': 'pcre',
'N': 'node',
None: 'glob'}
None: 'compound'}
target_info = parse_target(auth_entry)
if not target_info:

2
tests/unit/utils/test_minions.py
View file

@ -48,7 +48,7 @@ class CkMinionsTestCase(TestCase):
TestCase for salt.utils.minions.CkMinions class
'''
def setUp(self):
self.ckminions = salt.utils.minions.CkMinions({})
self.ckminions = salt.utils.minions.CkMinions({'minion_data_cache': True})
def test_spec_check(self):
# Test spec-only rule