11 Commits

Author	SHA1	Message	Date
Pedro Algarvio	9b1e55aa85	Import the full module namespace to avoid import shadowing. ... https://github.com/saltstack/salt/pull/39996#issuecomment-287857698	2017-03-28 19:02:47 +01:00
Pedro Algarvio	1f7a0aa65b	Proper mocking	2017-03-28 19:00:51 +01:00
Nicole Thomas	dd2bcb7c26	Merge pull request #39888 from ni3mm4nd/module_grains ... Add function for matching key/value grains	2017-03-14 11:36:40 -06:00
Jan Kadlec	a797a58ee6	Change function name to equals	2017-03-14 17:15:52 +01:00
Jan Kadlec	ea7faa0935	Rename function key_value_match to is	2017-03-11 07:35:24 +01:00
rallytime	9ddf032e8e	Merge branch '2016.11' into 'develop' ... Conflicts: - doc/ref/configuration/minion.rst - salt/beacons/status.py - salt/modules/saltutil.py - salt/utils/schedule.py - tests/integration/modules/test_beacons.py - tests/unit/beacons/inotify_beacon_test.py	2017-03-10 14:57:31 -07:00
Kadlec Jan	93306ba8a8	Fix linode white space	2017-03-08 17:14:56 +01:00
Kadlec Jan	2c67cfdbdb	Add function for matching key/value grains	2017-03-08 15:14:46 +01:00
Pedro Algarvio	40a64191a1	Absolute imports and A LOT of code cleanup.	2017-03-01 01:33:07 +00:00
Pedro Algarvio	3beb3fb801	Move whatever we need from salttesting to salt. ... Let's drop the salttesting dependency cycle.	2017-02-28 22:52:49 +00:00
Pedro Algarvio	15af4c9728	Test filenames conformity. Adjust for pytest.	2017-02-23 23:19:42 +00:00