From 0acf9a5383eec1b1dedc569e76bd9e7ae65c865e Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Tue, 27 Aug 2013 17:19:32 -0600 Subject: [PATCH] Remove deprecated matchers from compound matcher --- doc/topics/targeting/compound.rst | 1 - salt/minion.py | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/topics/targeting/compound.rst b/doc/topics/targeting/compound.rst index 50b99dfe8a..99f14e8d1b 100644 --- a/doc/topics/targeting/compound.rst +++ b/doc/topics/targeting/compound.rst @@ -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. diff --git a/salt/minion.py b/salt/minion.py index e8bfdc8110..c600d8088c 100644 --- a/salt/minion.py +++ b/salt/minion.py @@ -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 = []