98039 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	cf508a4a50	Merge branch '2017.7' into '2018.3' ... Conflicts: - requirements/opt.txt - requirements/tests.txt - salt/modules/win_service.py - tests/integration/states/test_service.py	2018-09-06 12:08:01 -04:00
twangboy	5f06dc2762	Fix issues with osx build scripts on 2018.3.3 ... Upgrade openssl to 1.0.2p	2018-09-06 10:05:58 -06:00
Nicole Thomas	d9f09da5d9	Merge pull request #49536 from rallytime/bp-49524 ... Back-port #49524 to 2018.3.3	2018-09-06 12:00:00 -04:00
twangboy	750d3fa29e	Remove trusted host switches	2018-09-06 09:59:46 -06:00
Nicole Thomas	cb934bf0b6	Merge pull request #49535 from Ch3LL/skip_pip_mac ... Skip test_virt and pip_state requirements tests on macosx	2018-09-06 11:59:37 -04:00
Pablo Suárez Hernández	cf27069dcb	Fix some pylint issues	2018-09-06 16:49:36 +01:00
Nicole Thomas	397296f088	Merge pull request #49539 from twangboy/fix_osx_build_2 ... Fix issues with build script on OSX	2018-09-06 11:49:35 -04:00
twangboy	6b42e73ee9	Fix issues with build script on OSX ... Upgrade openSSL to 1.0.2p Upgrade six to 1.11	2018-09-06 09:37:24 -06:00
Dmitry Kuzmenko	7eb8d6c374	Postgress module unit test fix.	2018-09-06 17:28:04 +02:00
Nicole Thomas	bbc8c80c77	Merge pull request #49513 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-09-06 10:07:26 -04:00
Nicole Thomas	c3468250f4	Merge pull request #49521 from terminalmage/fix-splay-executor ... Fix _get_hash in splay executor	2018-09-06 10:06:53 -04:00
Nicole Thomas	75a3b52215	Merge pull request #49527 from terminalmage/remove-special-envs-handling ... Remove special handling for file_envs fileserver func	2018-09-06 10:03:05 -04:00
Nicole Thomas	3f7c89cc14	Merge pull request #49526 from terminalmage/fix-backends-error-logging ... Prevent lookup error when trying to lookup fileserver function from LazyDict	2018-09-06 10:01:29 -04:00
Gareth J. Greenaway	9e7203e08a	Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests.	2018-09-06 09:36:35 -04:00
Nicole Thomas	bf939f9811	Merge pull request #49524 from garethgreenaway/1075_disable_boto_tests ... [2018.3] Disable boto tests under 3.7	2018-09-06 09:35:18 -04:00
Aleksei Plotnikov	b56aedc052	Optimize postgres groups management ... Use single SQL query to fetch all roles. Fixes #34734 and #35070. Also fixes issue with nologin roles being added to groups every time Salt is run.	2018-09-06 15:14:00 +02:00
Pablo Suárez Hernández	a0ed59dad9	Fix recursive cases on linux_acl.absent state	2018-09-06 11:37:37 +01:00
Pablo Suárez Hernández	4a018490b8	Add unit tests to cover recursive cases of linux_acl states	2018-09-06 11:37:37 +01:00
Pablo Suárez Hernández	f739b6f995	Fix typo on variable name	2018-09-06 11:37:37 +01:00
Pablo Suárez Hernández	dc6d1d7d6b	Fix wrong recurse behavior on for linux_acl.present state	2018-09-06 11:37:37 +01:00
Daniel A. Wozniak	6a4f8239d7	Fix merge wart	2018-09-05 23:34:45 -07:00
Erik Johnson	1478a76560	Remove special handling for file_envs fileserver func ... https://github.com/saltstack/salt/pull/49389 made this special handling obsolete.	2018-09-05 22:18:49 -05:00
Erik Johnson	1f0288e633	Prevent lookup error when trying to lookup fileserver function from LazyDict ... This prevents an unnecessary failed lookup, which as of the fluorine release cycle will result in an error being logged.	2018-09-05 22:13:30 -05:00
Gareth J. Greenaway	5ec5578fe1	Disable various boto tests when run under python 3.7 because of //github.com/spulec/moto/issues/1706. which was causing the test suite to hang on unit tests.	2018-09-05 19:47:21 -07:00
Ch3LL	50237e9daf	Skip test_virt and pip_state requirements tests on macosx	2018-09-05 17:49:07 -04:00
Erik Johnson	bbb8fe8540	Fix _get_hash in splay executor ... You can't pass a unicode value to bytearray()	2018-09-05 16:09:07 -05:00
rallytime	7d1d50701b	Lint: Remove unused import	2018-09-05 15:53:56 -04:00
Nicole Thomas	f73f2e5bb6	Merge pull request #49511 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2018.3.3 to 2018.3	2018-09-05 15:52:24 -04:00
Nicole Thomas	13f1d2633b	Merge pull request #49512 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.8 to 2017.7	2018-09-05 15:52:00 -04:00
Mike Place	208cfe6d7a	Merge pull request #49515 from rallytime/update-codeowners ... Add some files to the CODEOWNERS files for team-core to own	2018-09-05 10:17:42 -06:00
rallytime	1faab8bc01	Add some files to the CODEOWNERS files for team-core to own ... And also fix a couple of bugs found when writing tests for the matching used by tamarack bot. This expands the files that the core team will be requested for on pull request reviews.	2018-09-05 09:56:07 -04:00
rallytime	862c44c036	Merge branch '2018.3' into 'fluorine' ... No conflicts.	2018-09-05 09:41:04 -04:00
rallytime	de7ef3d681	Add "in progess" notation back to 2017.7.8 release notes ... We need this notation in the branch for now. We will remove it once the release is live.	2018-09-05 09:39:14 -04:00
rallytime	edad2dcda9	Merge branch '2017.7.8' into '2017.7' ... No conflicts.	2018-09-05 09:36:33 -04:00
rallytime	3ffc6c2520	Merge branch '2018.3.3' into '2018.3' ... Conflicts: - tests/integration/states/test_file.py - tests/support/helpers.py - tests/whitelist.txt	2018-09-05 09:34:27 -04:00
Nicole Thomas	34e517410f	Merge pull request #49327 from twangboy/fix_win_service ... Fix issues with win_service	2018-09-05 09:24:54 -04:00
Nicole Thomas	d24c96f394	Merge pull request #49505 from Ch3LL/rn_7.8_2 ... Update 2017.7.8 ChangeLog with new fixes	2018-09-05 09:08:40 -04:00
Ch3LL	d40b6444a1	Update 2017.7.8 ChangeLog with new fixes	2018-09-04 17:28:50 -04:00
twangboy	74e944b178	Mark test_service_status_running as flaky	2018-09-04 15:15:31 -06:00
Nicole Thomas	d53cd16601	Merge pull request #49501 from rallytime/merge-fluorine ... [fluorine] Merge forward from 2018.3 to fluorine	2018-09-04 17:02:43 -04:00
Nicole Thomas	ebfd7f9079	Merge branch '2018.3' into 49452_collections_abc	2018-09-04 15:03:45 -04:00
Nicole Thomas	81a49a82e9	Merge pull request #49500 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-09-04 15:02:30 -04:00
Nicole Thomas	87d3dfe085	Merge pull request #49499 from rallytime/pin-cherrypy-2018.3.3 ... Pin CherryPy version to < 18.0.0 in requirements files for PY2	2018-09-04 14:52:43 -04:00
Nicole Thomas	16ca360d1e	Merge pull request #49497 from rallytime/bp-49473 ... Back-port #49473 to 2018.3	2018-09-04 14:44:24 -04:00
Nicole Thomas	0d7b173b24	Merge pull request #49498 from rallytime/pin-cherrypy-2017.7.8 ... Pin CherryPy version to < 18.0.0 in requirements files for PY2	2018-09-04 13:55:01 -04:00
Mike Place	8380be9477	Merge pull request #49478 from dwoz/test_fixes ... Test fixes	2018-09-04 11:02:57 -06:00
rallytime	0c8b412556	Merge branch '2018.3' into 'fluorine' ... Conflicts: - tests/integration/modules/test_archive.py	2018-09-04 12:05:48 -04:00
rallytime	2317b5ef58	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/client/ssh/__init__.py - tests/integration/modules/test_win_ntp.py	2018-09-04 12:01:38 -04:00
rallytime	1aa3935c11	Lint: Add range import from six	2018-09-04 11:04:30 -04:00
rallytime	9e274335a3	Pin CherryPy version to < 18.0.0 in requirements files for PY2 ... Version 18.0 now requires Python 3.5, so we need to pin this for Py2.	2018-09-04 10:51:12 -04:00