valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,198 Commits 24 Branches 182 Tags 341 MiB
2ac3da8d03
Commit Graph

77198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Johannes Löthberg
2ac3da8d03 ref/configuration/master: Document ping_on_rotate 
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
 2017-01-10 23:01:06 +01:00
Mike Place
424e83d472 Merge pull request #38643 from cachedout/vsphere_py3 
Move to getfullargspec() for py3 in vsphere module
 2017-01-10 13:08:53 -07:00
Mike Place
948a2e508f Merge pull request #38644 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-10 13:04:22 -07:00
Mike Place
682e81b423 Merge pull request #38646 from cloudflare/HIPCHAT-ENGINE 
Various improvements for the hipchat engine
 2017-01-10 11:03:33 -07:00
Mike Place
07a11b81d0 Remove trailing whitespace 2017-01-10 10:49:56 -07:00
Mike Place
08246dce47 Merge pull request #38653 from OrlandoArcapix/issue31606-add_preempible_gce 
Added preemptible flag to gce.py - see issue #31606
 2017-01-10 10:00:35 -07:00
OrlandoArcapix
15d8c8d06b Added preemptible flag to gce.py - see issue #31606 2017-01-10 09:32:22 +00:00
Mircea Ulinic
1d32f4f5d8
Various improvements for the hipchat engine 
- allow api_url & api_key (duplicate for token), in order to be
consistent with the hipchat module and state,
ref: https://docs.saltstack.com/en/latest/ref/modules/all/salt.modules.hipchat.html
- wait_time: interval between consecutive polls of the channel
(previously hardcoded to 5 seconds, which remains the default)
- max_rooms: max number of rooms to look into
(previously hardcoded to 1000, which is still the default value)
 2017-01-09 19:07:49 +00:00
rallytime
d4f8f4ca7a Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-01-09 11:57:28 -07:00
Mike Place
037fcaab57
Move to getfullargspec() for py3 in vsphere module 2017-01-09 11:50:03 -07:00
Mike Place
4dd22f54d0 Merge pull request #38623 from mikelodder7/develop 
Added new execution modules. Update to salt-minion
 2017-01-06 18:58:47 -07:00
Mike Place
b07fc4ae3b Fix invalid syntax and add python future 2017-01-06 15:36:34 -07:00
Mike Place
5498f11554 Single quotes and python future 2017-01-06 15:34:10 -07:00
Mike Place
007fa7906d Python future 2017-01-06 15:27:41 -07:00
Mike Place
b931c98588 Python future 2017-01-06 15:27:06 -07:00
Mike Place
d30155e770 Double-quotes -> single-quotes 
Per style guide
 2017-01-06 15:26:33 -07:00
Mike Place
674bf01868 Python future 2017-01-06 15:24:28 -07:00
Mike Place
0a86b6bba1 Python future 2017-01-06 15:23:36 -07:00
Mike Place
cf34252664 Python future 2017-01-06 15:22:33 -07:00
Mike Place
d67f6937d7 Merge pull request #38627 from cachedout/pr-38476 
Pr 38476
 2017-01-06 15:05:45 -07:00
Mike Place
2a423ffedd
Add changes to raetkey 2017-01-06 15:04:54 -07:00
Mike Place
b13cd1370f Merge pull request #38610 from yue9944882/2016.11 
Fix #38595 - Unexpected error log from redis retuner in master's log
 2017-01-06 14:47:21 -07:00
Mike Place
956602244d Merge pull request #36759 from msiebeneicher/improvement/fix_log_output_for_json_and_yaml 
Fix log output for `--output=yaml`
 2017-01-06 14:44:53 -07:00
C. R. Oldham
179d385003 Merge pull request #38406 from alex-zel/fix-eauth-groups-permissions 
Fix eauth error with openLDAP/389 directory server groups
 2017-01-06 14:40:29 -07:00
Mike Place
993596b10a Merge pull request #38218 from rallytime/cmd-run-alias-deprecation 
Remove support for aliasing cmd.run to cmd.shell
 2017-01-06 14:36:18 -07:00
Mike Place
7f37b56ba7 Double quotes to single quotes 
Per style guide
 2017-01-06 14:33:31 -07:00
Mike Place
ffac8326c5 Double-quotes to single quotes 
To satisfy SaltStack's style guide.
 2017-01-06 13:06:06 -07:00
Mike Place
cf54216e31 Double-quotes to single-quotes 
This is to comply with the Salt style guide. No functional changes were made.
 2017-01-06 12:51:33 -07:00
Mike Place
a5abde07ff Merge pull request #38606 from whiteinge/slsutil-docstring-fix 
Fix slsutil docstring ~~cleverness~~ boneheadedness
 2017-01-06 12:30:20 -07:00
Mike Place
c4796617d8 Merge pull request #38608 from cachedout/preview_target 
Salt CLI target preview
 2017-01-06 12:29:22 -07:00
rallytime
65032d885e Update shell enabled integration tests with cmd.run aliasing removed 
With support for cmd.run --> cmd.shell aliasing removed in this PR,
some of the tests looking for the old behavior need to be adjusted.

1. `test_template_default_enabled` was renamed to `test_template_shell`
and the cmd.run call was changed to a cmd.shell call. Since the
aliasing for cmd.run to cmd.shell has been removed for templates, this
test is no longer necessary. Instead of removing the test, we can use
it to check that cmd.shell works correctly in a state + template
context.
2. The `python_shell=False` kwarg was removed from the template in the
`test_template_default_disabled` test since python_shell=False should be
the default now. (Note the test was renamed for clarity.)
 2017-01-06 14:17:28 -05:00
Mike Place
43a209bd12 Remove unused imports for lint 2017-01-06 11:32:45 -07:00
Mike Place
154791becb Merge pull request #37567 from NaviSteve/ldap-unicodePwd 
Add unicode password formatting utility function to ldap3 module
 2017-01-06 11:29:26 -07:00
Mike Place
3f55af9dba Merge pull request #37756 from wise0wl/develop 
Added all input variables for Joyent CreateMachine API call, fixed an…
 2017-01-06 11:09:56 -07:00
Mike Place
dc40743b02 Merge pull request #36318 from jeanpralo/fix-return-error-for-no-response 
PR regarding #25469
 2017-01-06 11:05:54 -07:00
Mike Place
82e9b3d1a1 Merge pull request #38619 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-06 10:51:18 -07:00
Mike Place
791499c813 Merge pull request #38620 from rallytime/merge-develop 
[develop] Merge forward from 2016.11 to develop
 2017-01-06 10:50:58 -07:00
Michael Lodder
214ab60127 Merge branch 'develop' of https://github.com/mikelodder7/salt into develop 2017-01-06 10:33:54 -07:00
Michael Lodder
82473ad439 Update namecheap_users.py 
pylint
 2017-01-06 10:32:45 -07:00
Michael Lodder
0a769d5989 Update boto_efs.py 
pylint
 2017-01-06 10:32:45 -07:00
Michael Lodder
8063f58966 Update namecheap_ns.py 
pylint
 2017-01-06 10:32:45 -07:00
Michael Lodder
0c812067be Update namecheap_domains.py 
pylint
 2017-01-06 10:32:45 -07:00
Michael Lodder
7c1fb9f59d Update namecheap_dns.py 
pylint
 2017-01-06 10:32:45 -07:00
Michael Lodder
888d88d0d3 Update namecheap_ssl.py 
pylint
 2017-01-06 10:32:45 -07:00
Michael Lodder
712ad2c174 Update namecheap.py 
Fix lint issue
 2017-01-06 10:32:45 -07:00
Michael Lodder
019de7f825 Update minion.py 
Allow master_func to return a list of available masters
 2017-01-06 10:32:45 -07:00
Michael Lodder
81abc0957e Added boto efs execution module 2017-01-06 10:32:45 -07:00
Michael Lodder
77cfbf7fa8 Converted CRLF to LF 2017-01-06 10:32:45 -07:00
Michael Lodder
07e8b9083b Add namecheap execution modules 2017-01-06 10:32:45 -07:00
Michael Lodder
41c51550d4 Don't go over 80 per line 2017-01-06 10:32:45 -07:00