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

50082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
rallytime
588c13783c Salt-cloud logging clean up for windows functions 2015-09-23 10:24:31 -06:00
rallytime
9b6000135c [2014.7] Fixup salt-cloud logging 2015-09-23 10:24:20 -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
Ben Hosmer
3ce77db1bc Fix typo in AWS doc config 2015-09-21 09:36:46 -06:00
Justin Findlay
b22286476e Merge pull request #27253 from jfindlay/version.2015.5 
2015.5 -> 2015.5.0
 2015-09-18 17:44:43 -06:00
Justin Findlay
e90412d3b8 Merge pull request #27252 from jfindlay/version.2014.7 
2014.7 -> 2014.7.0
 2015-09-18 17:44:39 -06:00
Justin Findlay
967e3bb72a 2015.5 -> 2015.5.0 2015-09-18 16:27:02 -06:00
Justin Findlay
3d28307a00 2014.7 -> 2014.7.0 2015-09-18 16:08:47 -06:00
Mike Place
51a0193b54 Merge pull request #27244 from garethgreenaway/ec2_create_snapshot_no_return_data_exception 
Exception in cloud.ec2.create_snapshot
 2015-09-18 15:41:11 -06:00
Gareth J. Greenaway
820fd576b9 Fixing the cause when the r_data from aws.query is empty and an exception happens when looking for the snapshotID 2015-09-18 12:21:36 -07:00
Mike Place
26540f15bc Merge pull request #27231 from jfindlay/cronchange 
only write cron file if it is changed
 2015-09-18 12:23:09 -06:00
Colton Myers
579f375f74 Merge pull request #27233 from basepi/release.notes.stubs 
[2015.5] Add stub release notes for 2015.5.6
 2015-09-18 10:55:40 -06:00
Colton Myers
f4563ea9b7 Add stub release notes for 2015.5.6 2015-09-18 10:54:15 -06:00
Colton Myers
f5a322e3f2 Merge pull request #27208 from basepi/nop.state.25423 
[2015.5] Add test.nop state
 2015-09-18 10:50:17 -06:00
Colton Myers
9414b05b2c Add test.nop example 2015-09-18 10:49:45 -06:00
Justin Findlay
1e335297e2 only write cron file if it is changed 
Fixes #27215.
 2015-09-18 10:42:58 -06:00
Mike Place
59a07cae68 Merge pull request #27201 from jfindlay/sshhash 
rename hash_hostname to hash_known_hosts
 2015-09-18 09:45:03 -06:00
Mike Place
560545c4c5 Merge pull request #27214 from jacksontj/2015.5 
Correctly support https, port 443 is not a requirement
 2015-09-18 09:43:05 -06:00
Thomas Jackson
e7526bdb44 Correctly support https, port 443 is not a requirement 2015-09-17 19:05:10 -07:00
Colton Myers
a84ce67b8f Add test.nop state 
A no-op state that does nothing. Useful in conjunction with the `use`
requisite, or in templates which could otherwise be empty due to jinja
rendering

Unlike test.succeed_without_changes, takes **kwargs to be more flexible.

Also removed the test stuff from succeed_without_changes. If a state
doesn't make changes, its behavior should be identical whether in test
mode or not.
 2015-09-17 17:22:49 -06:00
Justin Findlay
1b620b77cd rename hash_host arg to hash_known_hosts 
Fixes #27187.
 2015-09-17 12:41:19 -06:00
Justin Findlay
12f14ae37c update hash_known_hosts docs in ssh module 2015-09-17 12:08:49 -06:00
Mike Place
7a34c7742d Merge pull request #27172 from rallytime/bp-27150 
Back-port #27150 to 2015.5
 2015-09-17 11:25:51 -06:00
Justin Findlay
e956d88f5f Merge pull request #27194 from rallytime/bp-27180 
Back-port #27180 to 2015.5
 2015-09-17 10:17:24 -06:00
Tanky Woo
327d343fef file copy ret result True if no change in test mode 2015-09-17 09:26:16 -06:00
Colton Myers
a02d043309 Merge pull request #27176 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-09-17 09:00:40 -06:00
Colton Myers
66f4641be3 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 
Conflicts:
    doc/conf.py
    salt/__init__.py
    salt/cli/__init__.py
 2015-09-16 18:39:16 -06:00
Joseph Hall
de2027426e Merge pull request #27170 from rallytime/gce-docs 
Update Getting Started with GCE docs to use cloud.profiles or cloud.profiles.d examples
 2015-09-16 16:23:51 -06:00