valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,278 Commits 24 Branches 182 Tags 341 MiB
c2301d4aff
Commit Graph

11 Commits

Author SHA1 Message Date
rallytime
55fe0aa2e4 Merge branch 'carbon' into 'develop' 
No conflicts.
 2016-10-11 17:22:12 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922) 
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
 2016-10-11 16:33:23 -06:00
msiebeneicher
c067c7e5b6 fixed pylint issues 2016-09-30 11:07:52 +02:00
msiebeneicher
8c8ac46b74 added unit tests for state.show_state_usage functionality 2016-09-29 18:06:45 +02:00
Erik Johnson
9ee1b967f1 Rewrite top file merging tests 2016-08-30 08:58:18 -05:00
Erik Johnson
48a99bc939 Add missing import after moving highstate tests 2016-08-30 08:58:18 -05:00
Erik Johnson
fde7d68b89 HighState -> salt.state.HighState 2016-08-30 08:58:17 -05:00
Erik Johnson
f1613d733d Move highstateconf_test tests into state_test.py 
This keeps the tests organized and following the same naming convention
established elsewhere.
 2016-08-30 08:58:17 -05:00
Mike Place
69a108e9fa Raise SaltRenderError on bad requisite (#35373) 
* Raise SaltRenderError on bad requisite

Refs #35226

* Remove extra vals
 2016-08-11 10:48:23 -06:00
rallytime
59bd51f4c8 Update test to correct iteration 2016-06-02 14:32:21 -04:00
rallytime
a580d1c6e0 Add unit test for format_log change 2016-06-02 09:26:39 -04:00