Bo Maryniuk
ed171176a8
Rename unit test while using no patterns
2017-11-10 19:50:46 +01:00
Bo Maryniuk
15fc88c46e
Bugfix: file.line insert=after
2017-11-10 19:50:46 +01:00
Bo Maryniuk
d08307f53b
Add unit test for file.line insert=after
2017-11-10 19:50:46 +01:00
Bo Maryniuk
39126da5a2
Update unit test data
2017-11-10 19:50:46 +01:00
Bo Maryniuk
47fbe03c14
Add unit test for file._starts_till function
2017-11-10 19:50:46 +01:00
Bo Maryniuk
93e0df03a2
Fix docs in the funtions
2017-11-10 19:50:46 +01:00
Bo Maryniuk
599310e684
Fix docs for skipif decorator
2017-11-10 19:50:46 +01:00
Bo Maryniuk
d5d653af45
Add unit test for file.line on no location/before/after check failure
2017-11-10 19:50:46 +01:00
Bo Maryniuk
5b76c41f44
Move all file.line unit tests to the own class
2017-11-10 19:50:46 +01:00
Bo Maryniuk
f0f08a10e8
Add unit test for file.line on an empty content while not deleting anything
2017-11-10 19:50:46 +01:00
Bo Maryniuk
b5a80231bd
Rename a unit test and clarify its purpose in docs
2017-11-10 19:50:46 +01:00
Bo Maryniuk
c8452476ac
Rename long name variable, format a better error message
2017-11-10 19:50:46 +01:00
Bo Maryniuk
cf191b01d6
Add unit test for file.line on mode checks
2017-11-10 19:50:46 +01:00
Mike Place
8b834e341d
Merge pull request #44288 from eradman/onlyif_unless
...
Report 'onlyif' and 'unless' conditions as true or false
2017-11-10 11:37:01 -07:00
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
Nicole Thomas
9302149604
Merge branch 'develop' into develop
2017-11-10 10:56:12 -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
Nicole Thomas
0a8419358b
Merge branch 'develop' into separate-key-dir-from-cache-dir
2017-11-10 10:39:53 -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
4cd832a13b
Merge branch 'develop' into develop
2017-11-10 08:15:48 -07: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
6150aa88b1
Merge branch 'develop' into fix_38838
2017-11-10 07:09:26 -07: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
Volodymyr Samodid
112d52adb0
move decision statement to upper if block
2017-11-10 11:32:27 +02: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
Volodymyr Samodid
766cd24dbc
fix #38838
...
update aptpkg.list_pkgs behavior
2017-11-09 14:16:57 +02:00
Volodymyr Samodid
16c6163d72
fix #38838
...
update aptpkg.list_pkgs behavior
2017-11-09 13:38:49 +02:00
Gareth J. Greenaway
a8e495f18f
Updating documentation and release notes.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
3a71865c97
fixing docs per @rallytime
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
7cdf703884
Updating tests for watch_any_fail and require_any_fail.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
4dbd3e5567
Updating unit tests to limit to two required states.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
ca9e8a99b3
Replacing tabs with spaces.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
efbfa5abf2
Adding state file used in integration tests.
2017-11-08 16:06:44 -08:00
Gareth J. Greenaway
58d22a169c
Adding docs and integration tests.
2017-11-08 16:06:43 -08:00
Gareth J. Greenaway
3ffab16a4d
If a state is in prerequired, do not add to the self.pre to the list of requirements.
2017-11-08 16:06:43 -08:00
Gareth J. Greenaway
d9dcb84fe3
tweaking
2017-11-08 16:06:43 -08:00
Gareth J. Greenaway
d2bfa95018
Merging in watch_any changes
2017-11-08 16:06:43 -08:00
Connor de la Cruz
2cec3d1587
Fixed a bug with change output when not pruning
...
Union operator was being used on a set and a list. Cast the list to a
set, then cast the resulting set from the union back into a list before
adding it to ret['changes']
2017-11-08 16:26:03 -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
