Merge branch '2014.7' into develop

This commit is contained in:
Pedro Algarvio 2014-11-09 14:19:33 +00:00
commit 1071ec0859

View File

@ -27,7 +27,6 @@ cp.__opts__ = {}
cp.__pillar__ = {}
cp.__grains__ = {}
cp.__context__ = {}
templates.TEMPLATE_REGISTRY = {}
@skipIf(NO_MOCK, NO_MOCK_REASON)