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
69,121 Commits 24 Branches 182 Tags 341 MiB
71ebf2c8cd
Commit Graph

69121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
e1a373fa4c Merge pull request #35497 from deepakhj/2015.8 
Fixes spacing in requirements files
 2016-08-17 18:34:15 +09:00
Mike Place
5bd44b10a7 Merge pull request #35498 from rallytime/file-state-docs 
Add supported templates list to all template doc references in file state
 2016-08-17 18:33:36 +09:00
Erik Johnson
5b12f030c6 Add func to salt.utils.systemd to tell if scopes are available 2016-08-17 04:02:56 -05:00
Erik Johnson
4048255ed6 Merge pull request #35508 from terminalmage/update-docstring 
Add Carbon to versionadded for git.diff
 2016-08-17 01:17:12 -05:00
Erik Johnson
67c945fce0 Add Carbon to versionadded for git.diff 2016-08-17 01:15:40 -05:00
Ch3LL
ccb2a5cadf remove unused imports 2016-08-16 15:21:20 -06:00
Ch3LL
512ae81dfd remove TMP and add integration.TMP 2016-08-16 15:18:24 -06:00
rallytime
6190b2d738 Add supported templates list to all template doc references in file state 
Refs #35336
 2016-08-16 14:24:07 -06:00
Deepak Jagannath
685db4ab88 Fix spacing 2016-08-16 13:16:59 -07:00
rallytime
9bae3d09a6 Use correct deprecated notation instead of a warning. 
This should help make the documentation more clear to fix #35458.
 2016-08-16 14:06:28 -06:00
Sergey Kizunov
cf2e2daab9 Make auth_timeout user configurable again 
There was code that was overriding the value of `auth_timeout` regardless
of what was set in the configuration. It was overriding it to be 5
seconds. Although 5 seconds is sufficient for most cases, in testing, I
have found it insufficient for the following use case (running both
Windows master and minions):

1) Start salt-master
2) Start salt-minion
3) Stop salt-master
4) Start salt-master

The minion reconnect will timeout after step 4. Due to this, we set the
`auth_timeout` to be 15 seconds in our own configuration file. However,
due to this issue, that configuration value was ignored and thus we
fail on reconnects.

`salt/minion.py`:
- Don't hard-code the `auth_timeout` to 5 seconds. Use the user configured
value (or the default value if the user didn't configure a value).

`salt/config/__init__.py`:
- Made the default be 5 seconds for `auth_timeout` instead of 60. Chose 5
seconds because this is the current hard-coded behavior.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-08-16 12:58:07 -06:00
Nicole Thomas
6df4648765 Merge pull request #35487 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-16 12:36:21 -06:00
C. R. Oldham
cec7f6a7ec remove unneeded import 2016-08-16 12:08:47 -06:00
Daniel Wallace
2d8ec1e9db use __opts__ in salt.utils.cloud for cache functions 2016-08-16 12:03:45 -05:00
rallytime
c6c82be1de Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/cloud/deploy/bootstrap-salt.sh
 2016-08-16 11:02:05 -06:00
Nicole Thomas
bfe7107a87 Update bootstrap script to latest stable (2016.08.16) (#35486) 2016-08-16 10:58:23 -06:00
Thomas S Hatch
240fc12863 Merge pull request #35413 from cachedout/issue_35296 
Resolve path issues with cp.push
 2016-08-16 10:40:39 -06:00
C. R. Oldham
e31555345f Add timeout documentation. 2016-08-16 09:54:54 -06:00
Thomas S Hatch
c3319b2a8b Merge pull request #35476 from cachedout/issue_35380 
Fixup SSH bug where sudo without sudo user would break
 2016-08-16 09:41:25 -06:00
C. R. Oldham
901ab8b74c Remove unnecessary log statements 2016-08-16 09:39:20 -06:00
Mike Place
ee525b11b2 Make salt-client aware of edge-case where saltutil might be broken (#35446) 
* Make salt-client aware of edge-case where saltutil might be broken

Closes #34161

* Remove debugging

* Remove debugging pass
 2016-08-16 08:58:43 -06:00
Tanky Woo
914eb60d51 Fix iptables target options with no arguments 
For example:

  - name: test
    jump: CT
    notrack: ''
    ...
 2016-08-16 16:00:00 +08:00
Mike Place
c05fcf33d1 Fixup SSH bug where sudo without sudo user would break 
Fixes #35380
 2016-08-16 12:28:18 +09:00
Mike Place
fb8a12d677 Fix silly error 2016-08-16 11:05:18 +09:00
Mike Place
004778c966 Merge pull request #35471 from terminalmage/issue34479 
win_pkg: Fix traceback when package is not installed
 2016-08-16 11:02:00 +09:00
Mike Place
5c9428c32d Merge pull request #35448 from isbm/isbm-zypper-106-fix 
Add ignore_repo_failure option to suppress zypper's exit code 106 on …
 2016-08-16 10:39:43 +09:00
Mike Place
f90ecbb15e Merge pull request #35449 from dkruger/fix-35422 
aptpkg will specify --install-recommends if enabled by the SLS
 2016-08-16 10:38:56 +09:00
Mike Place
1473474b04 Merge pull request #35451 from isbm/isbm-zypper-mod_repo-unchanged 
Bugfix: zypper mod repo unchanged
 2016-08-16 10:38:25 +09:00
Mike Place
a8c4f17f50 Merge pull request #35453 from theothergraham/fix_CacheDisk 
fixes #34279 - disk cache ttl expiry
 2016-08-16 10:34:33 +09:00
Mike Place
d8c35b5260 Merge pull request #35459 from thatch45/shim_fix 
Ensure that output for salt-ssh gets back
 2016-08-16 10:29:16 +09:00
Mike Place
d2dd78e25b Merge pull request #35467 from rallytime/bp-33518 
Back-port #33518 to 2016.3
 2016-08-16 10:17:01 +09:00
Erik Johnson
e243c63e43 win_pkg: Fix traceback when package is not installed 2016-08-15 19:14:49 -05:00
anthony-shaw
e427815caf fix clrf 2016-08-15 16:30:58 -06:00
anthony-shaw
be41a400fa commit fix 2016-08-15 15:53:29 -06:00
anthony-shaw
06530b5461 add a test to check existing functionality is broken 2016-08-15 15:53:05 -06:00
Graham McCullough
ae5b233d51 fixes #34279 2016-08-15 14:34:20 -07:00
Nicole Thomas
5aeb74de63 [2016.3] Update bootstrap script to latest stable (2016.08.15) (#35461) 2016-08-15 13:23:34 -06:00
Nicole Thomas
38b60a32e5 [2015.8] Update bootstrap script to latest stable (2016.08.15) (#35460) 2016-08-15 13:23:24 -06:00
Nicole Thomas
9b2c075611 Merge pull request #35456 from rallytime/merge-2016.3 
[2016.3] Merge forward from 2015.8 to 2016.3
 2016-08-15 13:16:22 -06:00
Thomas S Hatch
10037b00cb Some environments refuse to return the command output 
This results in the output from salt-ssh being empty,
this fix ensures that the output is always there
 2016-08-15 12:57:58 -06:00
rallytime
6a86a12294 Merge branch '2015.8' into '2016.3' 
Conflicts:
  - salt/modules/cp.py
 2016-08-15 11:23:44 -06:00
Mike Place
d75005c519 Fix cp.push_dir pushing empty dirs (#35442) 
Fixes #35010
 2016-08-15 11:00:54 -06:00
Nicolas Delaby
49af330492 Docker 1.12 reports tags as null (#35447) 
Add support for this new value.
 2016-08-15 10:58:50 -06:00
Mike Place
09925ba353 Minor doc fixup (#35436) 
* Minor doc fixup

Refs #35387

* Include reload_grains
 2016-08-15 09:53:56 -06:00
Bo Maryniuk
8790197d86 Fix Unit test for suppressing the exception removal on non-modified repos 2016-08-15 17:35:25 +02:00
Bo Maryniuk
3f00c6997a Remove zypper's raise exception if mod_repo has no arguments and/or no changes 2016-08-15 17:35:01 +02:00
Bo Maryniuk
dd82e6a848 Add ignore_repo_failure option to suppress zypper's exit code 106 on unavailable repos 2016-08-15 15:03:53 +02:00
Mike Place
a0b128a85a Merge pull request #35132 from sjorge/2015.8-35121 
fixes , causing lots of mayham (onchange) with 2016.3.2 for me
 2016-08-15 16:11:22 +09:00
Mike Place
be644a58e1 Correct errant call to argspec from master. Fix ext_job_cache. (#35427) 
We were passing a string to the argpsec checker when it expects the actual func.
 2016-08-14 10:58:03 -06:00
Mike Place
a53cdc1971 Resolve stacktrace logged by highstate outputter if sls cannot be found (#35428) 
Simply return an empty string instead of a None.

Fixes #35423
 2016-08-14 10:54:15 -06:00