87920 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	9fcc2a70b5	Merge branch '2016.11' into '2017.7' ... Conflicts: - tests/unit/modules/test_rh_ip.py	2017-11-10 10:33:25 -05:00
Nicole Thomas	0176529510	Merge branch 'develop' into pkgin_uptodate	2017-11-10 08:30:26 -07:00
Nicole Thomas	4f3a79df07	Merge pull request #44467 from twangboy/win_fix_test_doc ... Fix `unit.test_doc` for Windows	2017-11-10 08:21:57 -07: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
twangboy	0a9e862bf4	Use regex to split	2017-11-09 16:24:19 -07:00
twangboy	de6b394445	Remove unneeded functions	2017-11-09 14:16:08 -07:00
twangboy	ee0914f7e9	Fix some lint, remove unnecessary function	2017-11-09 14:16:08 -07:00
twangboy	d52a7c12db	Fix typo in PasswordComplexity policy	2017-11-09 14:16:08 -07:00
twangboy	44f8f43812	Fix problem where 0 isn't 0	2017-11-09 14:16:03 -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	ff4f13877f	Merge pull request #44443 from Ch3LL/ssh_grains ... Add salt-ssh grains.items test	2017-11-08 17:42:10 -07: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
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
Ch3LL	5d1a9af4b5	Add salt-ssh grains.items test	2017-11-08 13:41:11 -05:00
Georges Racinet	5c01c74fbc	Merge branch 'develop' of github.com:saltstack/salt into 42713_mine.get_back_compat ... ... and fixed conflict	2017-11-08 18:09:04 +01:00
Georges Racinet	728c9b65a5	Unit test for backwards compatibility of mine.get ... Could not find calls to RemoteFuncs in unit tests, therefore started a new one, hope it's in the appropriate place. The test replaces the caceh by its own (very limited) one. It's quite possible it could be improved by reusing another one meant for unit tests.	2017-11-08 18:02:29 +01: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	a66cd67d15	Merge pull request #44260 from seanjnkns/issue-39901 ... Fixes #39901 for RH/CentOS 7	2017-11-07 16:14:58 -07: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	dcdf2d4c90	Merge pull request #44429 from Ch3LL/orch_doc ... Fix orch doc from pillat.get to pillar.get	2017-11-07 16:06:38 -07:00