valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
50,007 Commits 24 Branches 182 Tags 341 MiB
ee6e0ed057
Commit Graph

50007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
ee6e0ed057 Merge pull request #27468 from cachedout/fix_27351 
Fix 27351
 2015-09-29 09:35:29 -06:00
Mike Place
a214c7f84e Merge pull request #27479 from aboe76/fix_locale_suse 
fix locale on opensuse and suse #27438
 2015-09-29 09:34:48 -06:00
Mike Place
931f593b51 Merge pull request #27483 from rallytime/fix-17103 
Outputters should sync to output, not outputters, on the minion.
 2015-09-29 09:33:08 -06:00
Mike Place
9c2c028953 Merge pull request #27484 from rallytime/bp-27434-and-27470 
Back-port #27434 and #27470 to 2015.5
 2015-09-29 09:32:03 -06:00
rallytime
441241eb90 Change sync_outputters to sync_output for consistency, but alias sync_outputters 2015-09-29 08:16:15 -06:00
Mike Place
5de2ee35ab Minor doc fixup. 
Language and grammar changes.
 2015-09-28 17:19:21 -06:00
ZhiFeng Hu
af656c7e87 Doc: copy key to server via ssh-copy-id 
Signed-off-by: ZhiFeng Hu <hufeng1987@gmail.com>
 2015-09-28 17:19:09 -06:00
rallytime
105528720b Outputters should sync to output, not outputters, on the minion. 
Otherwise, the loader won't pick them up.

Fixes #17103
 2015-09-28 16:53:53 -06:00
Nicole Thomas
927874d316 Merge pull request #27469 from twangboy/fix_27433 
Added quotes to version numbers example
 2015-09-28 15:54:43 -06:00
Niels Abspoel
a8f2dad1be fix locale on opensuse and suse #27438 2015-09-28 22:35:41 +02:00
Mike Place
382a53403f Merge pull request #27467 from cachedout/lint_27375 
file.managed: check contents_{pillar|grain} result
 2015-09-28 14:22:16 -06:00
Mike Place
0bc37c0d41 Fix test 2015-09-28 12:57:22 -06:00
twangboy
a996ea46e2 Added quotes to version numbers example 
Fixes #27433
 2015-09-28 12:52:59 -06:00
Mike Place
4e54a98f5e Lint #27375 2015-09-28 12:46:28 -06:00
Mike Place
ed6207a438 Merge pull request #27419 from rallytime/fix-9856 
Amend error log to include multiple tips for troubleshooting.
 2015-09-28 11:53:19 -06:00
Mike Place
73fa89edf7 Merge pull request #27426 from rallytime/fix-16753 
Don't stacktrace if there are conflicting id errors in highstate
 2015-09-28 08:52:51 -06:00
Joseph Hall
5dd1b70475 Merge pull request #27408 from rallytime/fix-27406-for-2015.5 
Fix avail_locations function for the softlayer_hw driver in 2015.5
 2015-09-25 17:34:50 -06:00
rallytime
f6cbd81e66 Don't stacktrace if there are conflicting id errors in highstate 
Fixes #16753
 2015-09-25 16:48:33 -06:00
Colton Myers
8f9a3cfbaf Merge pull request #27410 from jacobhammons/doc-updates 
Fix css layout Refs #27389
 2015-09-25 16:38:48 -06:00
rallytime
551396564a Ammend error log to include multiple tips for troubleshooting. 
Fixes #9856
 2015-09-25 13:01:01 -06:00
rallytime
39a4ae5a6c Remove hdd: 19 refs from SL docs - no longer available from SoftLayer. 2015-09-25 12:54:25 -06:00
rallytime
de2f9234d3 Use correct default for bandwith 2015-09-25 12:50:13 -06:00
rallytime
42d8127f79 Don't set the optional_products default to a boolean, and then try to loop. 2015-09-25 12:43:59 -06:00
Jacob Hammons
a9fdecada1 Fix css layout Refs #27389 
sample typo fix in linux_acl
additional module folders listed in dynamic-modules
 2015-09-25 11:25:14 -06:00
rallytime
9d8a3d8303 Fix avail_locations function for the softlayer_hw driver in 2015.5 
Fixes #27406
 2015-09-25 11:04:45 -06:00
Justin Findlay
278ade52d2 file.managed: check contents_{pillar|grain} result 
Fixes #27342.
 2015-09-24 12:04:15 -06:00
C. R. Oldham
3746085587 Merge pull request #27336 from rallytime/cloud-logging-five 
[2015.5] Fixup salt-cloud logging
 2015-09-24 09:02:52 -06:00
C. R. Oldham
5a3be10a3e Merge pull request #27358 from lorengordon/escape-search-replacement-text 
Escape search replacement text, fixes #27356
 2015-09-24 07:52:46 -06:00
Loren Gordon
88bb1fbfff Escape search replacement text, fixes #27356 2015-09-23 17:42:18 -04:00
SaltyCharles
f9a19720de fix sysctl truncating newline on os x 2015-09-23 13:23:20 -07:00
C. R. Oldham
6759f79d6d Merge pull request #27345 from rallytime/docs-for-19236 
Allow use of rst header links by separating options out from yaml example
 2015-09-23 13:48:56 -06:00
rallytime
1d3925bbfb Added version tag for ex_disk_type option 2015-09-23 13:08:18 -06:00
rallytime
f23369300c Allow use of rst header links by separating options out from yaml example 
Also added docs to use the ex_disk_type option
 2015-09-23 13:06:25 -06:00
Mike Place
c2efb291e2 Merge pull request #26903 from bersace/fix-defaults-modules 
Review defaults.get
 2015-09-23 08:52:20 -06:00
Mike Place
a372466922 Merge pull request #27317 from efficks/fix27316 
State unzip should use unzip command instead of unzip_cmd.
 2015-09-23 08:41:35 -06:00
Mike Place
bd3771e80f Merge pull request #27309 from rallytime/fix-15514 
Change a value list to a comma-separated string in boto_route53.present
 2015-09-23 08:30:50 -06:00
François-Xavier Choinière
bf216c101e State unzip should use unzip command instead of unzip_cmd. Issue #27316 2015-09-22 20:23:04 -04:00
Justin Findlay
b5fe944875 Merge pull request #27311 from jfindlay/maxoc 
discuss replacement occurrences in file doc
 2015-09-22 16:23:10 -06:00
Justin Findlay
8ec2e921bd discuss replacement occurrences in file doc 
Fixes #27297.
 2015-09-22 15:23:43 -06:00
Colton Myers
ca4597b93a Merge pull request #27310 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-09-22 15:08:41 -06:00
Colton Myers
7b75e4aed1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-09-22 15:07:45 -06:00
Colton Myers
982c21c79f Merge pull request #27308 from terminalmage/fix-refresh_db-regression 
Fix refresh_db regression in yumpkg.py
 2015-09-22 15:07:28 -06:00
rallytime
9383d91ff8 Change a value list to a comma-separated string in boto_route53.present 
Fixes #15514
 2015-09-22 15:01:52 -06:00
Erik Johnson
77686fb7ce Fix refresh_db regression in yumpkg.py 
739b2ef introduced a regression by changing this function to passing a
list of arguments. The regression was also partly caused by requiring
the user to pass the yum CLI arguments for enabling and disabling repos
manually. So if someone passed multiple values for the repo argument
(e.g. repo='--disablerepo="*" --enablerepo=anotherrepo') then these
would both end up in the same list element, which would cause the yum
command to fail as they would be expected by yum to be a single argument
instead of separate arguments.

This commit reverts the changes from 739b2ef and also changes the
inconsistent behavior of requiring the repo options to be manually
submitted, making this function instead work like all the other
functions (install(), etc.) which interpret the Salt CLI kwargs to
figure out which repo options to use.

Fixes #27307.
 2015-09-22 15:11:33 -05:00
Mike Place
775a4f9ad0 Merge pull request #27286 from terminalmage/return_retry_timer 
Add a configurable timer for minion return retries
 2015-09-22 10:35:07 -06:00
Erik Johnson
540a7dfcf1 Add default values for new minion config options 2015-09-21 16:49:53 -05:00
Erik Johnson
453b883820 Add a configurable timer for minion return retries 
When a minion return cannot be processed in a timely manner, a
SaltReqTimeoutError is raised. However, the default wait time before the
minion will retry sending the return data was not being passed, so it
would wait a full 60 seconds.

This reduces that timeout to (by default) a maximum of 4 seconds, and
randomizes it to prevent a retry flood as you scale up the number of
minions.
 2015-09-21 16:49:53 -05:00
Justin Findlay
02482c0572 Merge pull request #27278 from rallytime/bp-27256 
Back-port #27256 to 2015.5
 2015-09-21 13:27:51 -06:00
Justin Findlay
e36c019c37 Merge pull request #27277 from rallytime/bp-27230 
Back-port #27230 to 2015.5
 2015-09-21 13:06:13 -06:00
Julian Brost
1beddf6311 Fix error handling in salt.modules.file.statvfs 
The old error messaged printed the wrong variable and was also
misleading as statvfs does not create any files.
 2015-09-21 09:38:33 -06:00