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

Conflicts:
	salt/master.sls
	salt/minion.sls
This commit is contained in:
Seth House
2014-10-09 16:39:07 -06:00
5 changed files with 47 additions and 37 deletions
+1 -1
View File
@@ -13,7 +13,7 @@ salt:
module_config:
test: True
test.foo: foo
test.bar:
test.bar:
- baz
- quo
test.baz: