5 Commits

Author	SHA1	Message	Date
rallytime	430c913c8c	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/auth/pam.py - salt/master.py - tests/unit/test_target.py	2017-12-28 12:15:54 -05:00
Gareth J. Greenaway	0ff811de70	Swapping import to be the old path for 2016.11	2017-12-21 08:17:53 -08:00
Gareth J. Greenaway	b3e2f388f5	Fix to allow nodegroups to include sequences	2017-12-20 16:56:16 -08: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