Mike Place
d753d8ba26
Merge pull request #44309 from cloudflare/http-logstash-eng
...
Improve the http_logstash engine
2017-11-10 11:34:27 -07:00
Mike Place
79eb8bbb4e
Merge pull request #44356 from skjaro/ipset-fix-subtypes-comma
...
Fix ipset state with multiple entries and subtypes separated with comma
2017-11-10 10:46:06 -07:00
Vitaliy
43e4861fc4
Fixed minor spelling mistake.
2017-11-10 12:30:12 -05:00
Mike Place
7274824aca
Merge pull request #44481 from rallytime/stale-config-update
...
Reduce the number of days an issue is stale by 10
2017-11-10 10:03:47 -07:00
Daniel Wallace
a83e9d892d
update kitchen yaml to use master for salt-jenkins
2017-11-10 09:40:07 -07:00
rallytime
caa0c54e9a
Reduce the number of days an issue is stale by 10
2017-11-10 11:24:42 -05:00
Nicole Thomas
519441e70f
Merge pull request #44448 from sjorge/zfsfuse
...
Simpler fallback check for zfs-fuse.
2017-11-10 08:14:12 -07:00
Nicole Thomas
75d26bf112
Merge pull request #44468 from DSRCorporation/bugs/mongo_users_do_not_fetch_twice
...
Do not perform the same request twice.
2017-11-10 08:13:30 -07:00
Erik Johnson
ec1c98f61d
Merge pull request #44445 from rallytime/fix-44435
...
Add a late-import for the salt.utils.master.py file in salt.auth
2017-11-10 07:03:48 -08:00
Nicole Thomas
d0ae909afc
Merge pull request #44442 from terminalmage/fix-leaked-filehandles
...
Use with blocks (or try/finally) to ensure filehandles are closed
2017-11-10 06:45:34 -07:00
Dmitry Kuzmenko
281f09d33a
Do not do the same request twice.
...
Found during code review. Originally there was 2 different functions to
check is user there and to fetch the users list. Then the first one was
replaced by more efficient that is the same that the second one.
Removed the unneeded second call.
2017-11-09 16:47:26 -07:00
Erik Johnson
1152f8ea08
Update reference to old salt.utils.which function
2017-11-09 15:06:25 -06:00
Erik Johnson
c1b6d35c0c
Python 3 compatibility fixes for kubernetes
...
dict.keys() is not a list in Python 3, and base64.b64encode requires
a bytestring.
2017-11-09 15:05:43 -06:00
Erik Johnson
b6ccfb45c8
Wait until after restoring original resource limit before removing temp files
...
Invoking shutil.rmtree() first was causing a traceback since the max
open files setting was still set very low for the test. This moves the
shutil.rmtree() until after we have restored the original resource
limit.
2017-11-09 15:05:43 -06:00
Erik Johnson
4eb248b129
Fix stacklevel in salt/utils/__init__.py
2017-11-09 15:05:43 -06:00
Erik Johnson
8a7d56369c
Use with blocks (or try/finally) to ensure filehandles are closed
...
This fixes a few sources (or potential sources) of filehandle leaks.
2017-11-09 15:05:40 -06:00
Jorge Schrauwen
624cff239e
Simpler fallback check for zfs-fuse.
...
This should fix #44447
2017-11-08 23:24:26 +01:00
Nicole Thomas
8e99aeed6a
Merge pull request #44415 from vernondcole/vagrant_cloud_minor_revisions
...
Vagrant and saltify cloud minor revisions
2017-11-08 15:22:18 -07:00
Nicole Thomas
2bf0df89cd
Merge pull request #44403 from eradman/swap_total
...
Implement swap_total grain on OpenBSD
2017-11-08 14:48:45 -07:00
Erik Johnson
5932e8a8ae
Merge pull request #44407 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-11-08 11:50:05 -08:00
Eric Radman
26417d8e83
Add integration test for (mem|swap)_total grains on OpenBSD
2017-11-08 14:38:20 -05:00
rallytime
1c4042f438
Add a late-import for the salt.utils.master.py file in salt.auth
...
Fixes #44435
PR #43703 inadvertently moved a "late import" statement up to the
top of the auth file, which caused the problem reported in the PR
itself and issue #44435 .
Moving the salt.utils.master import lower down in the file fixes
the issue.
2017-11-08 12:03:27 -07:00
Nicole Thomas
5aaea7f2b4
Merge pull request #44424 from mtkennerly/bugfix/issue-44423-win-path-prepend
...
Fix #44423 : Handle index=None and index=0 distinctly in the win_path.exists state
2017-11-08 09:55:33 -07:00
Nicole Thomas
9d79551f11
Merge pull request #44433 from dave92082/fix-typo-in-lgpo-module
...
Fix typo in win_lgpo module
2017-11-08 09:53:13 -07:00
Matthew Kennerly
ca71d0e7c2
Merge branch 'develop' into bugfix/issue-44423-win-path-prepend
2017-11-07 20:59:32 -05:00
Nicole Thomas
aec80ee1e1
Merge pull request #44353 from prymitive/file-managed-test-changes
...
File managed test changes
2017-11-07 16:09:09 -07:00
Nicole Thomas
76f3c001ee
Merge pull request #44430 from thatch45/doc_fix1
...
make it clear that disabling the job cache is bad
2017-11-07 15:53:10 -07:00
David Suarez
95f91e618d
Fix typo in win_lgpo module
...
Correct a typ in the win_lgpo module where policy was incorrectly spelled as 'polic'
2017-11-07 14:51:25 -08:00
Nicole Thomas
8ffe91fe44
Merge pull request #44405 from SEJeff/kubernetes-updates-v2
...
Kubernetes updates v2
2017-11-07 12:17:43 -07:00
Nicole Thomas
a29eeeec66
Fix a couple of small spelling errors
2017-11-07 12:16:28 -07:00
Nicole Thomas
72434918f4
Merge pull request #44420 from samodid/fix_docstrings_rendering
...
Fix docstrings rendering errors
2017-11-07 12:13:45 -07:00
Nicole Thomas
9251c43b50
Merge pull request #44428 from bbczeuz/bbczeuz-patch-dockertypos
...
Fix doc typo in docker_container/read_only
2017-11-07 11:33:48 -07:00
Thomas S Hatch
bed56e9dd7
make it clear that disableing the job cache is bad
2017-11-07 10:14:40 -07:00
Volodymyr Samodid
61abaa6ad5
fix small lint error
2017-11-07 19:14:17 +02:00
Claudius Zingerli
f8148257f9
Fix read_only doc typo
...
Following the examples, this should be 'rw' instead of 'ro'
2017-11-07 17:11:18 +01:00
Nicole Thomas
58d36631e1
Merge pull request #44421 from orymate/fix-salt-line-doc
...
fix states.file.line documentation formatting
2017-11-07 08:23:10 -07:00
Nicole Thomas
866ee6faea
Merge branch 'develop' into bugfix/issue-44423-win-path-prepend
2017-11-07 08:17:09 -07:00
Nicole Thomas
40e6d61f16
Merge pull request #44413 from sadminriley/develop
...
Fixed typo before libs import on common.py
2017-11-07 08:09:46 -07:00
Nicole Thomas
db7be6152f
Merge pull request #44380 from sjorge/zfs_grain_split
...
Split zfs related grain off into a seperate module
2017-11-07 08:07:36 -07:00
Riley
1c03d93013
Merge branch 'develop' into develop
2017-11-07 08:49:09 -05:00
sadminriley
b884429c8a
Merge branch 'develop' of github.com:sadminriley/salt into develop
...
Conflicts:
salt/config/schemas/common.py
2017-11-07 08:45:52 -05:00
Riley Louvier
5b65bef44a
Fixed typo before libs import
2017-11-07 08:43:33 -05:00
mtkennerly
24e698ec48
Fix #44423 : Handle index=None and index=0 distinctly
2017-11-07 06:52:12 -05:00
Mate Ory
840210c6db
file: fix file.line documentation formatting
...
There were mixed :param:s and simple paragraphs which resulted in a confusing
doc page.
2017-11-07 09:45:47 +01:00
Volodymyr Samodid
4cac95de3e
Update states docstring for better auto index description
2017-11-07 10:24:56 +02:00
Volodymyr Samodid
4e3c5075e1
Update modules docstring for better auto index description
2017-11-07 10:24:56 +02:00
Volodymyr Samodid
0c7f63e9d4
fix docstring errors during rendering
2017-11-07 10:24:56 +02:00
Jorge Schrauwen
d15a0f5340
Drop zpool grains from salt.grains.core
2017-11-07 08:19:45 +01:00
Jorge Schrauwen
3af235250d
Remove _zpool_data from the bsd_memdata test for grains
2017-11-07 08:17:50 +01:00
Super-User
e124fb81e9
Minor cleanup
2017-11-07 08:17:50 +01:00
