rallytime dbbfb0d2d4 Merge branch '2018.3' into 'fluorine' ... Conflicts: - salt/minion.py - salt/utils/data.py		2018-09-30 12:36:52 -04:00
..
os-releases	Update regexes in core grains for detecting the 'product' grain on	2018-05-16 16:34:07 -05:00
solaris	Update regexes in core grains for detecting the 'product' grain on	2018-05-16 16:34:07 -05:00
__init__.py	Add unit test for core grains	2016-02-24 10:15:01 -07:00
test_core.py	Merge branch '2018.3' into 'fluorine'	2018-09-30 12:36:52 -04:00
test_fibre_channel.py	Update fibre_channel grains tests to reflect changes in mock_open	2018-06-18 00:21:26 -05:00
test_iscsi.py	Fixing lint.	2018-09-07 20:17:00 -07:00
test_napalm.py	[PY3] add unicode_literals to log/grains modules	2018-01-10 11:37:59 -06:00