Revert "removed merge"

This reverts commit 125917b7d6.
This commit is contained in:
Seth House 2013-08-27 14:30:39 -06:00
parent 04ad0754aa
commit eb1b9c3664

View file

@ -20,4 +20,4 @@
'config': '/etc/mysql/my.cnf',
'python': 'dev-python/mysql-python',
},
}) %}
}, merge=salt['pillar.get']('mysql:lookup')) %}