Ch3LL 9ada8d9b7f Merge branch '2018.3' into '2019.2' ... Conflicts: - salt/transport/zeromq.py - tests/unit/modules/test_kubernetesmod.py - tests/unit/modules/test_win_file.py		2019-03-14 16:13:54 -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	Add Windows Server 2019	2019-02-07 10:27:23 -07:00
test_disks.py	Fix some lint	2019-03-05 17:13:08 -07: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