Mike Place
65a56a6f51
Merge pull request #33010 from Tanoti/state_grains_present_assert_only
...
For #31309 . If value not supplied only check for existence
2016-08-30 17:57:57 +09:00
Mike Place
6725cd458c
Merge pull request #35156 from twangboy/int_states_file
...
Fix integration tests for file state on Windows
2016-08-30 17:45:17 +09:00
Mike Place
353d4b70eb
Merge pull request #35180 from twangboy/int_states_cmd
...
Fix integration tests for cmd state on Windows
2016-08-30 17:44:04 +09:00
Mike Place
cbf927ea7a
Merge pull request #35703 from s0undt3ch/develop
...
Signal handling improvements
2016-08-30 17:37:01 +09:00
Mike Place
c41a37d65e
Merge pull request #35797 from hs-hannover/fix_35695
...
Fix #35695 , remove additional "data:" prefix
2016-08-30 16:24:56 +09:00
Mike Place
8cb2c14132
Merge pull request #35824 from rallytime/fix-35683
...
Add more documentation to the wheel key module
2016-08-30 16:22:34 +09:00
Mike Place
c10be40fc2
Merge pull request #35832 from alprs/fix-deep_merge_file_serialize
...
Deep merge with file.serialize merge_if_exists=True
2016-08-30 16:21:40 +09:00
Mike Place
83cd956b7b
Merge pull request #35845 from m03/dry-and-more-iis-unit-tests
...
Additional win_iis unit tests and DRY
2016-08-30 16:20:51 +09:00
Mike Place
c084a7f918
Merge pull request #35871 from amontalban/fix_35869_develop
...
Fixes #35869 for branch develop
2016-08-30 16:04:26 +09:00
Mike Place
f3ac4e4293
Merge pull request #35872 from amontalban/fix_35869_20163
...
Fixes #35869 for branch 2016.3
2016-08-30 16:04:10 +09:00
Mike Place
7f067bc4f8
Merge pull request #35879 from rallytime/doc-build-cleanup
...
Clean up some of the warnings during a doc build
2016-08-30 15:44:06 +09:00
Mike Place
3553da65c0
Merge pull request #35885 from terminalmage/zd868
...
Add documentation for runner events
2016-08-30 15:42:18 +09:00
Erik Johnson
a72fcf6aad
Add versionadded for args event docs
2016-08-30 00:48:06 -05:00
Erik Johnson
c6cdb049fc
Add documentation for runner events
2016-08-30 00:46:29 -05:00
rallytime
7e138a83f3
Don't import salt.utils twice in the pkgrepo state
2016-08-29 16:41:38 -06:00
rallytime
3d49f6a58d
Add yaml.parser to doc build mocks
2016-08-29 16:41:15 -06:00
Justin Anderson
e744b795d1
Make ddns_test happy with py3 and py26 ( #35857 )
...
* Make python3 and python26 happy
* Don't need both ways of nesting with statements
* No longer need pylint disable
* Lint fix
* take out the correct import
2016-08-29 16:33:54 -06:00
twangboy
f1bb655e82
Use returns instead of elses
2016-08-29 16:25:29 -06:00
twangboy
f5e0398cc0
Remove skipIf decorator
2016-08-29 16:13:41 -06:00
Justin Anderson
3f7e4d9f59
traversal_spec has skip=True, not false ( #35877 )
2016-08-29 16:12:16 -06:00
twangboy
1f7c4e2a32
Fix other mode tests for Windows
2016-08-29 16:12:06 -06:00
twangboy
ecd58bab06
Fix key error
2016-08-29 16:03:00 -06:00
twangboy
9be5d83a25
fix managed_file_mode test
2016-08-29 15:59:17 -06:00
rallytime
4ebfde9337
Remove node refernce in execution module docs: doesn't exist.
2016-08-29 15:33:26 -06:00
twangboy
566d9b4982
Close file properly
2016-08-29 15:29:47 -06:00
twangboy
b7263d24b5
Additional cachedout recommendations
2016-08-29 15:22:17 -06:00
rallytime
2320865e5c
Remove references to logstash_http engine: should be http_logstash.
2016-08-29 14:59:06 -06:00
Erik Johnson
16453e35f0
Fix legacy git_pillar tests ( #35713 )
...
* Add debug logging to legacy git_pillar tests
This is to aid in troubleshooting some failures on the branch builds
* Reverse monkey-patching after test completes
* Fix misspelling in git_pillar unit tests
* Ensure 2nd repo is updated
* Add logging for legacy git_pillar checkout func
* Explicitly set hash_type in opts for git_pillar tests
* Do not use dict.get() to get hash_type
This code is a relic from before we set a default value for this in
salt.config. There is no expectation that this value will be unset, so
there is no need to use dict.get() here.
2016-08-29 14:58:31 -06:00
twangboy
3c92e3ecf8
Add cachedout's changes
2016-08-29 14:53:41 -06:00
twangboy
97f3c1fa71
Add missing import
2016-08-29 14:53:41 -06:00
twangboy
9dfa523cc0
Fix test_symlink for Windows
2016-08-29 14:53:41 -06:00
twangboy
483c86b51f
Fix test_template_local_file and _no_clobber for linux
2016-08-29 14:53:41 -06:00
twangboy
aca27acc9b
Fix test_template_local_file and _noclobber
2016-08-29 14:53:41 -06:00
twangboy
31c983fac5
Fix test_template_local_file_noclobber for Windows
2016-08-29 14:53:41 -06:00
twangboy
a37f250460
Fix a few more tests for Windows
2016-08-29 14:53:41 -06:00
twangboy
85fc2f1adc
Fix test_absent_link, test_managed_contents
2016-08-29 14:53:41 -06:00
twangboy
aafe1aff38
Create missing source for symlink on windows
2016-08-29 14:53:41 -06:00
twangboy
c9acbfee38
Fix jinja
2016-08-29 14:53:41 -06:00
twangboy
cd2ce9fb01
Use Jinja instead of seperate files
2016-08-29 14:53:41 -06:00
twangboy
ba2047e37b
Fix a few more tests
2016-08-29 14:53:41 -06:00
twangboy
64ca61065d
Use IS_WINDOWS instead of salt.utils.is_windows
2016-08-29 14:53:41 -06:00
twangboy
b647630dd3
Add missing @ on decorators
2016-08-29 14:53:41 -06:00
twangboy
56180cf09d
Fix/Skip tests for windows
2016-08-29 14:53:41 -06:00
twangboy
4d4ffac5ae
Gate stuff that makes windows crash
2016-08-29 14:53:41 -06:00
Nicole Thomas
e9f65cc9be
Merge pull request #35867 from rallytime/merge-develop
...
[develop] Merge forward from 2016.3 into develop
2016-08-29 14:39:25 -06:00
Andres Montalban
50c785a3dd
Fixes #35869 for branch 2016.3
2016-08-29 16:25:18 -03:00
Andres Montalban
1ca900c9ae
Fixes #35869 for branch develop
2016-08-29 16:22:36 -03:00
rallytime
82e9cb748f
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/client/mixins.py
- salt/engines/sqs_events.py
- salt/minion.py
2016-08-29 12:48:43 -06:00
Mike Place
d7f242b9ca
deep merge with file.serialize merge_if_exists=True ( #35847 )
2016-08-29 12:23:18 -06:00
Nicole Thomas
96792663da
Add engines to list of extension module options in master config docs ( #35864 )
...
Fixes #35837
2016-08-29 12:22:30 -06:00
