7 Commits

Author	SHA1	Message	Date
yannis	99c7c12aba	Fix for mine to merge configuration on update. ... This fix was previously applied to 2015.5. It fixes #30722	2016-02-02 10:43:00 -08:00
Nicolas Delaby	9e56a7e9db	Expose container_id in mine.get_docker ... Because sometimes we should be able to perform additional introspection.	2015-10-02 21:30:33 +02:00
Mike Place	b5980ca54a	Migrate wtmp beacon to fopen	2015-08-11 15:57:04 -06:00
Nicolas Delaby	1e8e082f40	Migrate salt.mine to dockerng	2015-06-10 08:59:03 +02:00
Colton Myers	e3be4bf704	Mock pillar_pcre for the mine tests	2015-04-16 17:18:50 -06:00
rallytime	135ee5aafe	Python 3 compat for mine_test.py and other testing import needs	2015-02-06 07:46:47 -07:00
Rupesh Tare	236f1adfc2	implemented unit test cases for mine module	2015-02-04 18:36:12 +05:30