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
50,260 Commits 24 Branches 182 Tags 341 MiB
e9c13c561b
Commit Graph

50260 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
e9c13c561b Doc bug--salt.utils.http takes verify_ssl not ssl_verify. 2015-11-25 15:57:31 -07:00
Justin Findlay
30cc48e37f Merge pull request #28786 from chrigl/fix-28783 
closes #28783
 2015-11-11 14:01:19 -07:00
Christoph Glaubitz
ba6d814553 closes #28783 
Passing family in get_saved_rules to _parse_conf correctly.
 2015-11-11 21:04:25 +01:00
Nicole Thomas
8f1d0b636e Merge pull request #28776 from rallytime/bp-28740-2015.5 
Back-port #28740 to 2015.5
 2015-11-11 11:02:03 -07:00
Jarrod Moore
49256b7d90 Back-port #28740 to 2015.5 2015-11-11 10:07:06 -07:00
Seth House
77d4b980f1 Merge pull request #28760 from dmyerscough/28732-Fix-cherrypi-api-keys-endpoint 
Fixing CherryPy key bug
 2015-11-11 08:11:18 -07:00
Damian Myerscough
206d1684b2 Fixing CherryPy key bug 2015-11-10 22:20:59 -08:00
Mike Place
6f8f04975f Merge pull request #28746 from rallytime/bp-28718 
Back-port #28718 to 2015.5
 2015-11-10 11:16:39 -07:00
Steve Hajducko
092f441cad Account for no POST data 
The serving.request doesn't include a raw_body when the POST data
is blank, so set it to an empty dict.

Also fixed a bug where we assumed that if data wasn't a list, it
was a dict, which bombs because null POSTS result in None.
 2015-11-10 09:09:08 -07:00
Pedro Algarvio
f40c617bad Merge pull request #28705 from cachedout/tornado_http_headers 
Account for new headers class in tornado 4.3
 2015-11-09 19:24:33 +00:00
Mike Place
604a7b4199 Merge pull request #28699 from rallytime/bp-28670 
Back-port #28670 to 2015.5
 2015-11-09 11:10:58 -07:00
Mike Place
7bd3eb8370 Merge pull request #28703 from rallytime/bp-28690 
Back-port #28690 to 2015.5
 2015-11-09 11:01:57 -07:00
Mike Place
7ac6cde1ee Account for new headers class in tornado 4.3 
This started to fail with the test:  integration.netapi.rest_tornado.test_app.TestWebhookSaltAPIHandler.test_post

This happened with the introduction of Tornado 4.3 wherein headers were delivered as a subclass of a python dict, called HTTPHeaders http://www.tornadoweb.org/en/stable/releases/v4.3.0.html

This in turn caused msgpack serialization errors as we couldn't figure out how to serialize the new class. (Somewhat ironically, since the upstream change was made to better support serialization, but c'est la vie). Instead of trying to give hints to our serialialization lib, it seemed more sensible just to cast this back into a python dictionary before we put it onto the event bus.

Tested against tornado 4.3 and 4.2
 2015-11-09 10:56:12 -07:00
Nicole Thomas
2a40f57b93 Merge pull request #28694 from s0undt3ch/2015.5 
[2015.5] Update to latest bootstrap script v2015.11.09
 2015-11-09 10:49:53 -07:00
Metin OSMAN
a0988dab58 Fix 28689 : Check s3 ext pillar cache file before calculating expiration 2015-11-09 10:21:50 -07:00
Thayne Harbaugh
e436b23296 psutil can fail to look-up a uid and raise a KeyError 2015-11-09 09:48:58 -07:00
Pedro Algarvio
0910c6ffe4 Update to latest bootstrap script v2015.11.09 
* Make sure that wget is installed. saltstack/salt-bootstrap#868
 2015-11-09 16:29:45 +00:00
Mike Place
3249b322e8 Merge pull request #28669 from rallytime/fix-26592 
Use the -q argument to strip extraneous messages from rabbitmq
 2015-11-07 18:07:25 -07:00
Mike Place
29e8250d0c Merge pull request #28645 from jacksontj/2015.5 
Rework minion return_retry_timer
 2015-11-06 20:40:28 -07:00
Mike Place
1bbaea8aad Merge pull request #28668 from twangboy/fix_15177 
Fixed join_domain and unjoin_domain for Windows
 2015-11-06 20:40:04 -07:00
Thomas Jackson
f63c2d70a7 Rework minion return_retry_timer 
This feature originally would randomize between 1 -> return_retry_timer, which meant you could always had the possibility of haing a return retry with a timeout of 1s. This change maxes both ends of the range configurable (similar to how acceptance_wait_time is configured). In addition I've added coverage in the minion configuration documentation.

Cleanup of #27286
Fixes #28577
 2015-11-06 18:05:45 -08:00
Mike Place
4ad5056066 Merge pull request #28666 from jfindlay/r_data 
define r_data before using it in file module
 2015-11-06 17:46:26 -07:00
Mike Place
e129e889ad Merge pull request #28662 from cachedout/issue_24758 
Add note about disabling master_alive_interval
 2015-11-06 17:38:12 -07:00
twangboy
745b8f75f6 Fixed some lint 2015-11-06 17:30:31 -07:00
rallytime
098fb815af Use the -q argument to strip extraneous messages from rabbitmq 
Instead of trying to do it ourselves and worrying about which
version prints 'Listing vhosts...' and '...done' at the beginning
or end of the output or not.

Fixes #26592
 2015-11-06 17:20:10 -07:00
twangboy
a43eb53f28 Added version added notes in docs 2015-11-06 17:12:19 -07:00
twangboy
6b537c8640 Fixed join_domain and unjoin_domain for Windows 
Fixes #15177

Uses WMI instead of win32net
Added restart parameter
Seperated out error definitions into their own function
Added default workgroup to change to on unjoin
Added additional examples
Added additional parameter checking
Added function to get current domain or workgroup
 2015-11-06 17:06:11 -07:00
Justin Findlay
29228f445f define r_data before using it in file module 
Fixes #28174.
 2015-11-06 14:37:15 -07:00
Mike Place
78f4894333 Add note about disabling master_alive_interval 
Closes #24758
 2015-11-06 14:15:06 -07:00
Mike Place
df121d0cec Merge pull request #28627 from twangboy/backport_win_useradd 
Backport win_useradd
 2015-11-06 09:57:49 -07:00
Pedro Algarvio
64a20228c6 Merge pull request #28617 from cachedout/umask_module_sync 
Set restrictive umask on module sync
 2015-11-05 23:43:28 +00:00
twangboy
87282b6354 Backport win_useradd 
Backported win_useradd.py from 2015.8 to fix issues with unicode, etc.
 2015-11-05 14:32:55 -07:00
Joseph Hall
065f8c7fb3 Merge pull request #28622 from gravyboat/update_puppet_module_docs 
Update puppet module wording
 2015-11-05 13:34:07 -07:00
Forrest Alvarez
4ea28bed30 Update puppet module wording 2015-11-05 12:25:45 -08:00
Mike Place
227792e158 Set restrictive umask on module sync 
Fixes #28398
 2015-11-05 12:04:24 -07:00
Mike Place
08295de5a5 Merge pull request #28563 from s0undt3ch/2015.5 
[2015.5] Update to latest bootstrap script v2015.11.04
 2015-11-04 08:16:31 -07:00
Mike Place
1e09f186ce Merge pull request #28541 from twangboy/fix_28173 
Fixed problem with system.set_computer_name
 2015-11-04 07:48:54 -07:00
Mike Place
f44ed780b5 Merge pull request #28537 from jfindlay/decode_state_2015.5 
decode filename to utf-8 in file.recurse state
 2015-11-04 07:48:18 -07:00
Mike Place
6acf87593f Merge pull request #28529 from rallytime/fix-28272 
Update contributing and documentation pages to recommend submitting against branches
 2015-11-04 07:47:21 -07:00
Pedro Algarvio
16f4db79a0 Update to latest bootstrap script v2015.11.04 
* Allow bypassing dependencies installation. Thanks EYJ. saltstack/salt-bootstrap#656.
* Add FreeBSD 11 support. Thanks Chris Buechler(cbuechler). saltstack/salt-bootstrap#653
* Move RHEL installations to use repo.saltstack.com saltstack/salt-bootstrap#674
* Move Debian 8 installation to use repo.saltstack.com saltstack/salt-bootstrap#674
* Fix error finding python-jinja2 in RHEL 7. Thanks Rob Eden(hedinfaok). saltstack/salt-bootstrap#654
* Move Ubuntu 12 and 14 installations to use repo.saltstack.com saltstack/salt-bootstrap#674
* Move FreeBSD installations to use repo.saltstack.com saltstack/salt-bootstrap#674
* Use dnf on Fedora 22 and later. Thanks Michele Bologna (mbologna). saltstack/salt-bootstrap#665
 2015-11-04 12:37:04 +00:00
Nicole Thomas
025bff2bf0 Merge pull request #28548 from nmadhok/2015.5-task-error 
[Backport] [2015.5] Tasks can be in queued state instead of running
 2015-11-03 21:14:24 -07:00
Nitin Madhok
804a0a6537 Tasks can be in queued state instead of running. Fixes #28511 2015-11-03 18:37:34 -05:00
Justin Findlay
63bd3e52b3 Merge pull request #28531 from rallytime/fix-24585 
Add versionadded directives to virtualenv_mod state/module
 2015-11-03 14:34:49 -07:00
twangboy
7edf5ce370 Fixed problem with system.set_computer_name 
The previous function didn't fully change the name in windows
Fixes #28173
 2015-11-03 14:33:21 -07:00
rallytime
a959681858 Add link to Sending a GH PR to documentation docs 2015-11-03 14:07:49 -07:00
Justin Findlay
06e514940c decode filename to utf-8 in file.recurse state 
Fixes #28524.
 2015-11-03 14:03:50 -07:00
Mike Place
ea3bf972c4 Merge pull request #28508 from twangboy/fix_unit_tests_windows 
Fixed windows tests
 2015-11-03 12:31:12 -07:00
Mike Place
73c5735fc1 Merge pull request #28525 from rallytime/route53_spacing 
Fix spacing in doc examples for boto_route53 state and module
 2015-11-03 12:30:24 -07:00
rallytime
bc577b2531 Add versionadded directives to virtualenv_mod state/module 
Fixes #24585
 2015-11-03 11:22:51 -07:00
rallytime
1c612e2772 Update contributing and documentation pages to recommend submitting against branches 
Fixes #28272
 2015-11-03 10:44:29 -07:00