valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,390 Commits 24 Branches 182 Tags 341 MiB
2b92c383f1
Commit Graph

73390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
6dd5f68a08 Merge pull request #35856 from vutny/2015.8 
[BACKPORT 2015.8] salt-cloud: fix path to Salt Master socket dir
 2016-08-30 16:10:02 +09:00
Mike Place
cf8f081401 Merge pull request #35855 from vutny/salt-cloud-fix-sock_dir 
[REGRESSION] salt-cloud: fix path to Salt Master socket dir
 2016-08-30 16:09:04 +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
336d1a700d Merge pull request #35880 from terminalmage/issue35747 
pacman.py: Fix incorrect return in pkg.latest_version
 2016-08-30 15:43:39 +09:00
Mike Place
f0987cf27a Merge pull request #35881 from whiteinge/salt-api-catch-serializer-error 
Add fail-safe in case Salt gives us data we can't serialize
 2016-08-30 15:43:11 +09:00
Mike Place
6383451c99 Merge pull request #35884 from terminalmage/clarify-pkg-latest-logic 
Add clarifying comments to the pkg.latest state, fix USE flag condition
 2016-08-30 15:42:35 +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
a28d2aaa92 Change default for top_file_merging_strategy 2016-08-30 01:01:09 -05: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
Erik Johnson
e616d5b509 Raise exception if more than one opt is passed in the same string arg 2016-08-29 22:27:37 -05:00
Erik Johnson
b0b419d1d8 Fix condition for Gentoo USE flag update 
In this scenario, ``avail[pkg]`` contains an empty string, we want to
reinstall the current version with new USE flags so the
currently-installed version is what we need to add to the targets.
 2016-08-29 19:18:50 -05:00
Erik Johnson
1542fd4716 Add clarifying comments to the pkg.latest state 
These comments explain what is being done as we evaluate which packages
need to be added to the install targets and which do not.
 2016-08-29 19:14:06 -05:00
Erik Johnson
123a611066 pacman.py: Fix incorrect return in pkg.latest_version 
This was initially broken in 75fd92f. The documented behavior of this
function is to return an empty string for the package when the package
is up-to-date. Changing that behavior negatively affects the pkg.latest
state, which relies on the documented behavior.
 2016-08-29 18:59:12 -05:00
Seth House
6e27fad21f Add fail-safe in case Salt gives us data we can't serialize 
Possibly seen in the wild with return data from a Runner that contains a
strange encoding that the JSON serializer can't handle.
 2016-08-29 17:57:31 -06:00
Joseph Hall
a33cbac141 This ended up being a problem after all 2016-08-29 17:53:33 -06:00
Joseph Hall
4aefe13306 Have get_master_event check for detect 2016-08-29 17:53:33 -06:00
Joseph Hall
3f77e0a2e4 Remove debug log statement 2016-08-29 17:53:33 -06:00
Joseph Hall
dc404577c6 Gate zeromq 2016-08-29 17:53:33 -06:00
Joseph Hall
9cbf7ca7de Get rid of NoneType error for TCP 2016-08-29 17:53:33 -06:00
Joseph Hall
e229b0bc0b Set master back to zeromq 2016-08-29 17:53:33 -06:00
Joseph Hall
53d88d0701 Change master transport to tcp and minion transport to detect 2016-08-29 17:53:33 -06:00
Joseph Hall
7d35f6b78e Unset detect_mode 2016-08-29 17:53:33 -06:00
Joseph Hall
373b886400 Simplify break 2016-08-29 17:53:33 -06:00
Joseph Hall
71ba46a276 Linting 2016-08-29 17:53:33 -06:00
Joseph Hall
3b5c596673 Get TCP side working 2016-08-29 17:53:33 -06:00
Joseph Hall
4d83a3f22f Add transport failover 2016-08-29 17:53:33 -06: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