rallytime f23207002d Merge branch '2018.3' into 'develop' ... Conflicts: - salt/states/file.py - tests/unit/beacons/test_btmp_beacon.py - tests/unit/beacons/test_wtmp_beacon.py - tests/unit/grains/test_core.py		2018-06-15 17:00:59 -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 'develop'	2018-06-15 17:00:59 -04:00
test_fibre_channel.py	Remove unicode things	2018-03-15 12:55:26 -06:00
test_iscsi.py	Fix more crappy mocking	2018-06-13 15:01:12 -05:00
test_napalm.py	[PY3] add unicode_literals to log/grains modules	2018-01-10 11:37:59 -06:00