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
57,822 Commits 24 Branches 182 Tags 341 MiB
928ef59a8a
Commit Graph

57822 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
C. R. Oldham
928ef59a8a Merge pull request #27349 from jfindlay/doc_typos 
add freebsd install docs to release notes
 2015-09-24 07:51:02 -06:00
C. R. Oldham
331230ea4f Merge pull request #27343 from cachedout/issue_26889 
Close io loop before deleting attribute
 2015-09-24 07:49:55 -06:00
C. R. Oldham
cd82ead005 Merge pull request #27337 from rallytime/cloud-logging-eight 
[2015.8] Fixup salt-cloud logging
 2015-09-24 07:49:17 -06:00
C. R. Oldham
b2f8418ffc Merge pull request #27332 from terminalmage/adjust-dockerng-docstring 
Adjust dockerng/dockerio docstrings
 2015-09-24 07:45:34 -06:00
Justin Findlay
ac9e6c2532 Merge pull request #27353 from cachedout/fix_retry_get 
Fix case where var not set in config
 2015-09-23 15:45:32 -06:00
C. R. Oldham
3f6b06116f Merge pull request #27350 from rallytime/fix-21390 
Allow IP-forwarding in GCE driver
 2015-09-23 15:36:41 -06:00
Mike Place
ea286e1874 Fix case where var not set in config 2015-09-23 14:44:08 -06:00
rallytime
2bf566d934 Allow IP-forwarding in GCE driver 
Fixes #21390
 2015-09-23 14:27:55 -06:00
rallytime
484015a7a3 Added version tag for ex_disk_type option 2015-09-23 14:21:17 -06:00
rallytime
a71ebc97b2 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 14:21:06 -06:00
Justin Findlay
e509cfca17 fix typo in 2015.8.0 pull list 2015-09-23 14:03:12 -06:00
Justin Findlay
7137e731d3 add FreeBSD documentation to 2015.8.0 notes 2015-09-23 14:03:12 -06:00
Mike Place
2b648e51af Close io loop before deleting attribute 
Fixes #26889
 2015-09-23 11:31:30 -06:00
Mike Place
6f3da863fc Merge pull request #27305 from cachedout/issue_27103 
Re-init logging system on Windows when using multiprocessing
 2015-09-23 09:32:32 -06:00
Mike Place
684e33aeb2 Merge pull request #27331 from terminalmage/dockerng-cmd 
dockerng: Allow both cmd and command to be used to specify command
 2015-09-23 09:27:43 -06:00
Erik Johnson
a3f4fa1106 Merge pull request #27327 from isbm/isbm-pkg-info-typofix 
Fix a typo in the RPM output
 2015-09-23 09:27:42 -05:00
Erik Johnson
bdbf4d8e5c Add deprecation notice to dockerio state module 2015-09-23 09:21:13 -05:00
Erik Johnson
17829ab38d Fix name of dockerng module in dockerio docstring 2015-09-23 09:20:44 -05:00
Erik Johnson
ed5ae75180 Adjust dockerng docstrings 
This adds a similar documentation section to the top of the state module
to match the one in the execution module. It also updates the expected
release date of the Carbon release to reflect the new release cadence.
 2015-09-23 09:18:49 -05:00
Erik Johnson
7d4eaac8ae dockerng: Allow both cmd and command to be used to specify command 2015-09-23 09:11:29 -05:00
Bo Maryniuk
7912f8c13b Fix typo 2015-09-23 13:24:03 +02:00
Colton Myers
a789303d75 Merge pull request #27312 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-22 16:52:14 -06:00
Colton Myers
647080d064 Add missing import 2015-09-22 16:05:02 -06:00
Colton Myers
95e70f0bef Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/config.py
    salt/minion.py
    salt/modules/yumpkg.py
    salt/runners/ssh.py
    salt/states/git.py
    salt/states/http.py
 2015-09-22 15:20:17 -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
Mike Place
7a7492d186 Fix typo 2015-09-22 14:51:14 -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
Justin Findlay
c3b690273b Merge pull request #27303 from jacobhammons/ref-updates 
Updated module doc index using https://github.com/saltstack/salt/pull…
 2015-09-22 13:29:04 -06:00
Mike Place
aaa2db9943 Merge pull request #27301 from twangboy/fix_27081 
Pass ca_bundle for windows (fixes SSL Error)
 2015-09-22 13:00:44 -06:00
Mike Place
22c653482c Re-init logging system on Windows when using multiprocessing 
Closes #27103
 2015-09-22 12:55:47 -06:00
Jacob Hammons
7ac98a03b6 Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -06:00
twangboy
5c4f5f8944 Changed windows gate to check for verify_ssl option 2015-09-22 11:35:19 -06:00
Mike Place
55f4050146 Merge pull request #27300 from rallytime/bp-27287 
Back-port #27287 to 2015.8
 2015-09-22 10:59:07 -06: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
twangboy
e2fe5a60b5 Pass ca_bundle for windows (fixes SSL Error) 2015-09-22 10:33:28 -06:00
rhealitycheck
e49a6dc449 Update mongo_return.py 
same patch as for the future return. allows users to use older versions of pymongo if desired or the most recent ones.
 2015-09-22 09:35:07 -06:00
rhealitycheck
63153322b9 Update mongo_future_return.py 
Tracks the version so that it can compare pymongo versions and support older versions as well as the new versions that don't support "Connection"
 2015-09-22 09:35:07 -06:00
Justin Findlay
d96462af48 Merge pull request #27288 from rallytime/do-cleanup 
Filter on 'name', not 'id', when listing images
 2015-09-21 16:37:26 -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
rallytime
6e16fad760 Use name in all places, not id. 2015-09-21 14:36:49 -06:00
rallytime
9b34542cb0 Filter on 'name', not 'id', when listing images 
And fix doc example of what --list-images looks like
 2015-09-21 14:35:22 -06: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
688f24e9e4 Merge pull request #27283 from jtand/yumpkg_yum_fix 
__grains__['osrelease'] returns a string
 2015-09-21 13:18:44 -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
Justin Findlay
78d44a5c74 Merge pull request #27276 from rallytime/bp-27218 
Back-port #27218 to 2015.8
 2015-09-21 13:05:54 -06:00
Justin Findlay
d5ce81e8e7 Merge pull request #27275 from rallytime/bp-27213 
Back-port #27213 to 2015.8
 2015-09-21 13:05:18 -06:00
Nicole Thomas
2be21d6451 Merge pull request #27274 from rallytime/bp-27272 
Back-port #27272 to 2015.8
 2015-09-21 12:54:48 -06:00