Remove deprecated matchers from compound matcher

This commit is contained in:
Colton Myers 2013-08-27 17:19:32 -06:00
parent 611e62dc32
commit 0acf9a5383
2 changed files with 1 additions and 4 deletions

View File

@ -24,7 +24,6 @@ L List of minions ``L@minion1.example.com,minion3.domain.com or bl*.do
I Pillar glob ``I@pdata:foobar``
S Subnet/IP address ``S@192.168.1.0/24`` or ``S@192.168.1.100``
R Range cluster ``R@%foo.bar``
D Minion Data ``D@key:value``
====== ==================== ===============================================================
| Matchers can be joined using boolean ``and``, ``or``, and ``not`` operators.

View File

@ -1542,12 +1542,10 @@ class Matcher(object):
return False
ref = {'G': 'grain',
'P': 'grain_pcre',
'X': 'exsel',
'I': 'pillar',
'L': 'list',
'S': 'ipcidr',
'E': 'pcre',
'D': 'data'}
'E': 'pcre'}
if HAS_RANGE:
ref['R'] = 'range'
results = []