rallytime
|
cf038ee3fe
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- salt/grains/core.py
- salt/modules/file.py
- salt/modules/hosts.py
- salt/modules/inspectlib/collector.py
- salt/modules/portage_config.py
- salt/modules/x509.py
- salt/scripts.py
- tests/integration/shell/enabled.py
|
2016-08-11 11:33:54 -06:00 |
|
Mike Place
|
4625ee65b8
|
Remove unnedeed config test
Refs #34607
|
2016-07-18 09:12:18 -06:00 |
|
rallytime
|
760f479424
|
Merge branch '2015.8' into '2016.3'
Conflicts:
- salt/cli/daemons.py
- salt/config/__init__.py
- salt/scripts.py
- salt/state.py
- tests/unit/config/config_test.py
|
2016-04-05 15:09:27 -06:00 |
|
rallytime
|
e195376f61
|
Patch isdir call and test seach path tuple positions as well
|
2016-04-01 15:09:57 -06:00 |
|
rallytime
|
b86f6922c4
|
Print search_paths return for debugging
|
2016-04-01 13:52:43 -06:00 |
|
rallytime
|
bf48922e7d
|
Add test for 'deploy_scripts_search_path' contents in salt.config.cloud_config
|
2016-04-01 09:43:30 -06:00 |
|
Mike Place
|
f2bf2dff14
|
Adjust test for syndic config
Refs #28115
|
2015-12-02 09:35:48 -07:00 |
|
Pedro Algarvio
|
359348ba1c
|
Fix SSH Roster Schema unittests
|
2015-07-28 12:37:19 +01:00 |
|
Pedro Algarvio
|
034353040c
|
Make the tests discoverable
|
2015-07-28 12:23:18 +01:00 |
|
Pedro Algarvio
|
d649252878
|
Fix class reference
|
2015-07-28 10:33:08 +01:00 |
|
Pedro Algarvio
|
63cecaddf4
|
Implement the Roster config schema
|
2015-07-28 00:42:55 +01:00 |
|
Pedro Algarvio
|
eabc84d93c
|
Implemented RosterEntryConfig and added unit tests for it
|
2015-07-28 00:42:55 +01:00 |
|
Pedro Algarvio
|
ddf814174e
|
Rename the config unit tests module
|
2015-07-28 00:42:54 +01:00 |
|