mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 01:18:58 +00:00
Merge branch '2014.7' into develop
This commit is contained in:
commit
1071ec0859
@ -27,7 +27,6 @@ cp.__opts__ = {}
|
||||
cp.__pillar__ = {}
|
||||
cp.__grains__ = {}
|
||||
cp.__context__ = {}
|
||||
templates.TEMPLATE_REGISTRY = {}
|
||||
|
||||
|
||||
@skipIf(NO_MOCK, NO_MOCK_REASON)
|
||||
|
Loading…
Reference in New Issue
Block a user