4 Commits

Author	SHA1	Message	Date
Anthony Shaw	ff60aec050	fix munged merge	2016-07-25 15:58:45 +10:00
Anthony Shaw	7f31ccbf1e	Merge branch 'develop' of github.com:saltstack/salt into develop	2016-07-22 13:19:34 +10:00
Anthony Shaw	7786c0020c	Libcloud DNS module fix (#34628) ... * add test module * add broken test * fix typo in config dictionary * remove call to unused function, add called_with assertion	2016-07-13 11:47:20 -04:00
Anthony Shaw	4c61769024	add test module	2016-07-13 13:46:04 +10:00