valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
73,163 Commits 24 Branches 182 Tags 341 MiB
c10be40fc2
Commit Graph

73163 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Justin Anderson
3f7e4d9f59 traversal_spec has skip=True, not false (#35877) 2016-08-29 16:12:16 -06:00
rallytime
4ebfde9337 Remove node refernce in execution module docs: doesn't exist. 2016-08-29 15:33:26 -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
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
Nicole Thomas
40bcb7daed Fix IAM roles statement to be boto version specific in sqs_events (#35861) 
Fixes #35835
 2016-08-29 12:22:16 -06:00
Nicole Thomas
dec526a6f3 Bump arg parsing deprecation to Nitrogen (#35866) 
This needs to be handled with care, so let's bump this one more
release to make sure we do this properly.
 2016-08-29 12:21:55 -06:00
Nicole Thomas
ee45a88bc8 Fix doc formatting for sqs_events engine example config (#35860) 
Fixes #35834
 2016-08-29 12:21:28 -06:00
Nicole Thomas
96747bc3bb Merge pull request #35859 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-29 12:21:04 -06:00
Nicole Thomas
27697e952a Pylint fixes for develop branch (#35863) 2016-08-29 12:20:50 -06:00
Mike Place
ddb392bd81 This fixes a regression in the file state (#35852) 
This was introduced in 6fedd7f68d963c6865127bcab9684966aa653313

This is not supported in 2.6. Changed to use Salt's total_seconds wrapper.
 2016-08-29 11:27:43 -06:00
Justin Anderson
ab7e511fd1 Change osmajorrelease back to str (#35858) 2016-08-29 11:24:20 -06:00
rallytime
5f93d682aa Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/client/ssh/__init__.py
 2016-08-29 10:56:11 -06:00
Mike Place
9aea24aa47 Fixed a bug in windows hostname settings when the hostname is longer than 15 chars (#35848) 
- The previous implementation was limited to the 15 char limit for "Computernames" which would cause the state to always fail if the hostname was longer
 2016-08-29 10:09:53 -06:00
Mike Place
cdeec4da0e Minor formatting fixup to snapper docs (#35853) 2016-08-29 09:57:33 -06:00
Mike Place
dc705ff675 Merge pull request #35849 from theredcat/fix_file_makedirs_infinite_loop 
Fix potential infinite loop with no error when using recursive makedirs
 2016-08-29 20:37:19 +09:00
Mike Place
38abc42fb7 Merge pull request #35844 from cachedout/pr-35511 
Pr 35511
 2016-08-29 19:48:41 +09:00
Nathan Delhaye
86d5398b28 Fix potential infinite loop with no error when using recursive makedirs 2016-08-29 10:30:58 +02:00
mwinnett
f48ebd082f DRY, additional win_iis unit tests 2016-08-28 23:42:53 -07:00
Mike Place
f6ddee8ae1 Lint whitespace 2016-08-29 14:16:56 +09:00
Mike Place
53762b5807 Merge pull request #35581 from pbdeuchler/fix_docker_tag_check 
Correctly check if image is in current tags
 2016-08-29 13:17:32 +09:00
Mike Place
409f17aa58 Merge pull request #35673 from cro/proxy_getsi_fix 
Proxies don't handle reusing the SmartConnect instances very well.  D…
 2016-08-29 13:11:35 +09:00
Mike Place
433743f609 Merge pull request #35682 from vutny/backport-35659 
[BACKPORT] Fix empty `fun_agrs` field in Reactor generated events
 2016-08-29 13:11:06 +09:00
Mike Place
4c5e38aab7 Merge pull request #35721 from hu-dabao/clean-mess 
refactor a bit to clean up the mess, no functionality changes
 2016-08-29 13:08:04 +09:00
Mike Place
5bb62345f6 Merge pull request #35728 from alexbleotu/vmware_enhancements-gh 
Vmware enhancements gh
 2016-08-29 12:54:14 +09:00
Mike Place
aa43c71212 Merge pull request #35744 from twangboy/nsis.estimated.size 
Add Estimated Size for Add/Remove Programs
 2016-08-29 12:30:48 +09:00
Mike Place
f1b62b1e42 Merge pull request #35755 from bgw/digitalocean-ssh-agent 
Add ssh_agent support to digital_ocean provider
 2016-08-29 12:29:00 +09:00
Mike Place
51b304f4a8 Merge pull request #35757 from vutny/grains-filterby-wildcard 
grains.filter_by: lookup_dict key could be a globing pattern
 2016-08-29 12:23:05 +09:00
Mike Place
7727223efc Merge pull request #35766 from oms4suse/wip_fix_github_issue_35765 
salt.modules.ceph : fix for github issue 35765
 2016-08-29 12:19:51 +09:00
Mike Place
202d9adf2e Merge pull request #35778 from kraney/boto_cloudwatch_event 
Boto cloudwatch event
 2016-08-29 11:20:47 +09:00
Mike Place
eda2ae0add Merge pull request #35781 from thatch45/ssh_deploy_more 
follow up on the re-deploy if there is a checksum missmatch
 2016-08-29 11:15:25 +09:00
Mike Place
7a56ba8932 Merge pull request #35787 from tmehlinger/event-runner 
event runner
 2016-08-29 11:14:36 +09:00
Mike Place
30c2db7b09 Merge pull request #35792 from DSRCorporation/bugs/34973_syndic_reconnect_master_2016.3 
Reconnect syndic to event bus if master disappeared.
 2016-08-29 11:13:19 +09:00
Mike Place
7a7761e795 Merge pull request #35801 from cachedout/lower_cloud_retry 
Lower the retry timer for waiting for a server to come in
 2016-08-29 11:04:51 +09:00