Mike Place
|
2e1bfa38b9
|
Avoid a race between multiple auth requests for a minion key.
Refs #19061
|
2015-01-05 14:00:17 -07:00 |
|
Joseph Hall
|
92744e9541
|
mapper.opts, not self.opts
|
2015-01-05 13:46:06 -07:00 |
|
Joseph Hall
|
473dea47f0
|
Use proper query method from CloudClient
|
2015-01-05 13:42:39 -07:00 |
|
Mike Place
|
0194fbe77c
|
Attempt to fix inconsintent VT test by preventing a spin
|
2015-01-05 13:35:02 -07:00 |
|
Thomas S Hatch
|
c43256d5fc
|
Merge pull request #19350 from UtahDave/2014.7local
Fix thread leak on Windows when using threading.
|
2015-01-05 13:28:30 -07:00 |
|
Thomas S Hatch
|
e4b95b6031
|
Merge pull request #19330 from cro/sixfix
Use salt.ext.six instead of "import six"
|
2015-01-05 13:23:07 -07:00 |
|
David Boucha
|
d83858bb40
|
fix pylint whitespace errors
|
2015-01-05 11:48:01 -07:00 |
|
David Boucha
|
88fbb8bc90
|
fix pylint error: extra space after def
|
2015-01-05 11:44:10 -07:00 |
|
David Boucha
|
c26bf546a9
|
use unix line endings
|
2015-01-05 11:20:07 -07:00 |
|
David Boucha
|
473c3accdd
|
Don't cache sreq when using threading
This stops caching sreq when using threading as well as attempts to make
sure threads are tracked and reaped.
Fixes: 18515
Fixes: 19167
|
2015-01-05 11:03:50 -07:00 |
|
C. R. Oldham
|
35b82ab6e8
|
Use salt.ext.six instead of "import six", import it "as six"
|
2015-01-05 08:06:56 -07:00 |
|
Nicole Thomas
|
06795221be
|
Merge pull request #19334 from rallytime/pylint
Fix pylint on 2014.7 branch
|
2015-01-03 21:59:12 -07:00 |
|
rallytime
|
57514d824b
|
Fix pylint on 2014.7 branch
|
2015-01-03 21:44:09 -07:00 |
|
Hang Xie
|
6edc596f28
|
Write to temp file then move to data.p to avoid race condition
|
2015-01-03 16:41:36 -08:00 |
|
C. R. Oldham
|
434376cd69
|
Use salt.ext.six instead of "import six"
|
2015-01-03 09:09:38 -07:00 |
|
Joseph Hall
|
05089e188d
|
Merge pull request #19325 from twellspring/patch-2
Add private subnets
|
2015-01-02 20:31:49 -07:00 |
|
twellspring
|
f8883cebdd
|
Add private subnets
Added how to enable rackspace private subnets on servers instantiated by salt cloud
|
2015-01-02 19:28:45 -08:00 |
|
Thomas S Hatch
|
b8dd2af989
|
Merge pull request #19319 from garethgreenaway/18630_2014_7_mount_options
Fixes to mount module and mount state module
|
2015-01-02 10:05:41 -07:00 |
|
Thomas S Hatch
|
908f382b49
|
Merge pull request #19312 from llinder/2014.7
pydsl/pyobjects missing listen and listen_in
|
2015-01-02 10:02:05 -07:00 |
|
Thomas S Hatch
|
e2ed214a8d
|
Merge pull request #19310 from juiceinc/2014.7
Fix typo in Tomcat module docs
|
2015-01-02 10:01:54 -07:00 |
|
Thomas S Hatch
|
463974dc8b
|
Merge pull request #19299 from terminalmage/cleanup-pip-requirements
Cleanup pip state when requirements file is used
|
2015-01-02 09:58:21 -07:00 |
|
Thomas S Hatch
|
ebbb66ddb2
|
Merge pull request #19285 from lyft/add-splunk-search
Add initial splunk_search execution module and state module
|
2015-01-02 09:56:57 -07:00 |
|
Thomas S Hatch
|
04e22ee809
|
Merge pull request #19321 from cvedel/issue-18083
Add ssl_match_hostname to deps in thin tarball
|
2015-01-02 09:40:17 -07:00 |
|
Gareth J. Greenaway
|
547d55b8e6
|
removing unused import
|
2015-01-02 08:06:28 -08:00 |
|
Christophe Vedel
|
9aeda9b754
|
Add ssl_match_hostname to deps in thin tarball
|
2015-01-02 16:44:41 +01:00 |
|
Gareth J. Greenaway
|
2c7c5d3f81
|
merge conflict
|
2015-01-01 20:13:27 -08:00 |
|
Lance Linder
|
5c39c880fa
|
pydsl/pyobjects missing listen and listen_in
This pull request is to resolve issue 19311
|
2014-12-31 11:03:50 -06:00 |
|
Tim O'Guin
|
b9744c6fff
|
merge
|
2014-12-31 09:12:41 -06:00 |
|
Tim O'Guin
|
59bcfe6b74
|
fix config format typo in Tomcat module docs
|
2014-12-31 09:10:18 -06:00 |
|
Ryan Lane
|
217eec5cd3
|
lint fixes and better return statuses
|
2014-12-30 14:28:41 -08:00 |
|
Erik Johnson
|
68efa5a7a8
|
Cleanup pip state when requirements file is used
This cleans up the comments for the pip.installed state, removing an
extraneous comment and making a minor grammar fix.
|
2014-12-30 13:44:06 -06:00 |
|
Thomas S Hatch
|
38d4fec056
|
Merge pull request #19295 from belvedere-trading/2014.7
[32702] Patch salt to allow scheduling to work properly on Windows
|
2014-12-30 12:30:27 -07:00 |
|
Ben Levine
|
019eaf0cb1
|
[32702] Patch salt to allow scheduling to work properly on Windows
- See bug: https://github.com/saltstack/salt/issues/19277
- Fixes an issue where non-portable implementation prevented
Windows hosts from using 'when' or 'cron' based schedules
|
2014-12-30 11:00:09 -06:00 |
|
Ryan Lane
|
44a6b202b8
|
Pep format fixes
|
2014-12-29 18:01:38 -08:00 |
|
Ryan Lane
|
9a5ccdd307
|
Fix lint failures
|
2014-12-29 17:53:37 -08:00 |
|
Ryan Lane
|
5131e52f44
|
Add initial splunk_search execution module and state module
|
2014-12-29 16:24:34 -08:00 |
|
Thomas S Hatch
|
de30829af2
|
Merge pull request #19233 from lyft/elb-args-from-pillar
Elb args from pillar
|
2014-12-29 16:03:03 -07:00 |
|
Nicole Thomas
|
b824815682
|
Merge pull request #19284 from rallytime/pylint_new_branch
Pylint fix for the 2015.2 branch
|
2014-12-29 14:25:47 -07:00 |
|
rallytime
|
8c230f1332
|
Pylint fix for the 2015.2 branch
|
2014-12-29 14:11:01 -07:00 |
|
Thomas S Hatch
|
8b4ffc6534
|
Merge pull request #19266 from eliasp/2015.2-salt.states.portage_config-doc
Documentation improvements for 'salt.states.portage_config'.
|
2014-12-28 13:48:40 -07:00 |
|
Thomas S Hatch
|
cdf46ea2be
|
Merge pull request #19239 from lyft/asg-alarms
Asg alarms
|
2014-12-28 13:29:32 -07:00 |
|
Thomas S Hatch
|
cd1239a2d7
|
Merge pull request #19238 from jfindlay/ensure_cmd
update cmd state and module integration tests
|
2014-12-28 13:28:17 -07:00 |
|
Thomas S Hatch
|
030e097c14
|
Merge pull request #19231 from basepi/salt-ssh.mine.docs
Add docs for mine in salt-ssh
|
2014-12-28 13:26:01 -07:00 |
|
Thomas S Hatch
|
2c7753cf73
|
Merge pull request #19229 from rallytime/bp-19221
Backport #19221 to 2015.2
|
2014-12-28 13:10:45 -07:00 |
|
Thomas S Hatch
|
4f2ecf16b3
|
Merge pull request #19228 from rallytime/bp-19154
Backport #19154 to 2014.7
|
2014-12-28 13:08:53 -07:00 |
|
Thomas S Hatch
|
1671b7e926
|
Merge pull request #19226 from rallytime/bp-19121
Backport #19121 to 2014.7
|
2014-12-28 13:08:08 -07:00 |
|
Elias Probst
|
089acc8f51
|
Documentation improvements for 'salt.states.portage_config'.
|
2014-12-28 00:28:55 +01:00 |
|
Joseph Hall
|
7a6c7855da
|
Merge pull request #19251 from Lendar/fix-s3-get-regression
Fix GET regression in s3.query
|
2014-12-24 11:09:57 -07:00 |
|
Lendar
|
b21e0a8424
|
Fix GET regression in s3.query
Was broken in #19079
|
2014-12-24 19:27:06 +03:00 |
|
Ryan Lane
|
982592369e
|
Add note about alarm name
|
2014-12-23 13:10:23 -08:00 |
|