Merge remote-tracking branch 'origin/pr/47'

Conflicts:
	salt/master.sls
	salt/minion.sls
This commit is contained in:
Seth House committed 2014-10-09 16:39:07 -06:00
commit 1682df8592
5 files changed
+47 -37

No files matched your search

+1 -1
View File
@@ -13,7 +13,7 @@ salt:
module_config:
test: True
test.foo: foo
test.bar:
test.bar:
- baz
- quo
test.baz: