Commit Graph

50494 Commits

Author SHA1 Message Date
Elias Probst
37eeab2683 Typo (with → which) 2015-11-13 06:34:20 -07:00
Nicole Thomas
4b8bdd0afb Merge pull request #28839 from cachedout/revert_28740
Revert #28740
2015-11-12 15:54:28 -07:00
Mike Place
215b26c06f Revert #28740 2015-11-12 12:52:55 -07:00
Colton Myers
eb904665dc Merge pull request #28832 from basepi/backport.28826
[2015.5] Backport #28826
2015-11-12 12:32:03 -07:00
Colton Myers
eff811a0ad Merge pull request #28833 from basepi/increase.gather_job_timeout.8647
[2015.5] Increase the default gather_job_timeout
2015-11-12 12:31:58 -07:00
Colton Myers
e4a036365d Merge pull request #28829 from basepi/merge-forward-2015.5
[2015.5] Merge forward from 2014.7 to 2015.5
2015-11-12 11:50:51 -07:00
Colton Myers
c09243dd01 Increase the default gather_job_timeout
If minions are offline, this will increase the total time it takes
for the CLI to realize they're offline and stop listening, but I
think that's a reasonable tradeoff for decreased issues with missing
real returns, like in #8647.

Fixes #8647
2015-11-12 11:20:05 -07:00
Colton Myers
57be72eb91 Add backports_abc and singledispatch_helpers to thin as well 2015-11-12 11:15:41 -07:00
Colton Myers
897cad627b Add singledispatch to the thin 2015-11-12 11:15:32 -07:00
Colton Myers
f8b8441485 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-11-12 11:01:07 -07:00
Mike Place
93562631aa Merge pull request #28756 from MrCitron/fix-25775
Fix #25775
2015-11-12 10:47:50 -07:00
Metin Osman
82075c809c Add logs and correct pylint error 2015-11-11 23:47:02 +01:00
twangboy
c0cf33332c Fixed some Lint... 2015-11-11 14:27:06 -07:00
Justin Findlay
30cc48e37f Merge pull request #28786 from chrigl/fix-28783
closes #28783
2015-11-11 14:01:19 -07:00
Shane Lee
df17fc59d3 Merge pull request #6 from jfindlay/twang_test
Twang test
2015-11-11 13:58:55 -07:00
Justin Findlay
bc7e0cfe64 add file.symlink unit tests 2015-11-11 13:37:47 -07:00
Justin Findlay
9381dc7215 orthogonalize file.symlink unit tests 2015-11-11 13:37:18 -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
Nicole Thomas
76e69b4bff Merge pull request #28777 from rallytime/bp-28740-2014.7
Back-port #28740 to 2014.7
2015-11-11 11:00:00 -07:00
Jarrod Moore
da5fac2b36 Back-port #28740 to 2014.7 2015-11-11 10:09:37 -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
Metin Osman
e31e22d96a Fix 25775
Loop lsblk cmd exec until ok or 30s max
2015-11-11 01:33:25 +01: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
Nicole Thomas
45c73ebf2f Merge pull request #28716 from rallytime/bp-28705
Back-port #28705 to 2014.7
2015-11-10 09:15:03 -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
Gareth J. Greenaway
771e9f7b6f Fixing the salt scheduler so that it only attempts to return the job data to the master if the scheduled job is running from a minion's scheduler. 2015-11-09 22:12:23 -08:00
Mike Place
f4fe921965 Merge pull request #28717 from cachedout/umask_note
Add note about recommended umask
2015-11-09 16:26:20 -07:00
Mike Place
1874300e08 Add note about recommended umask
Closes #28199
2015-11-09 15:46:57 -07:00
Mike Place
32e7bd3ea0 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 15:42:35 -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