12 Commits

Author	SHA1	Message	Date
Mike Place	8ad37e0558	Remove debugger	2015-08-11 11:29:19 -06:00
Mike Place	05c21297de	Fix env ordering in merged list	2015-08-11 11:29:13 -06:00
Mike Place	8ca0e59891	Lint	2015-08-11 11:28:59 -06:00
Mike Place	cfb6982227	Adding some dictupdate merge tests ... Add new option for top_file_merging_strategy to config Add master config file option Adding additional tests Lexicographical test works Make default strategy Simplify to just an option about whether or not to merge Changes Implement ordered top files Implement merge strategies and default top files Lint Doc rewrite and start on ordering Remove debugging Moving to env_order Adding env_order Still writing tests More tests and docs	2015-08-11 11:28:40 -06:00
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
Pedro Algarvio	c6eab06e70	Add required imports	2014-12-02 07:44:16 +00:00
Pedro Algarvio	0dd818053e	Proper minion config setup	2014-12-02 07:34:45 +00:00
Pedro Algarvio	52d0d01d09	Set the cachedir to a relative path	2014-10-12 02:16:23 +01:00
Matthew Williams	45fadcf885	fix bugs in highstate whitelist, add tests	2014-06-24 17:38:53 -04:00
Pedro Algarvio	d02a2bc224	Include the python encoding file header on tests.	2013-11-27 11:19:24 +00:00
Pedro Algarvio	b03a5fcee3	Stop using the deprecated check_dns in salt.config.minion_config.	2013-07-20 01:38:09 +01:00
Joost Cassee	7fd85c2963	Allow listing a single module in a top match ... This makes the following valid syntax for the top.sls file: base: tommy.example.com: webserver jerry.example.com: dbserver alberon.example.com: mailserver develop: saturn.example.com: webserver	2013-07-04 00:20:08 +02:00