94494 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Gareth J. Greenaway	b6afdae7c9	Fixing lint.	2018-09-07 20:17:00 -07:00
Gareth J. Greenaway	d2fb68c8ed	Fixes various tests that were failing under python 3.7.	2018-09-07 20:17:00 -07:00
Nicole Thomas	8b971e5e5a	Merge pull request #49533 from silenius/2018.3.3 ... [cherry-pick] Optimize postgres groups management	2018-09-07 14:58:56 -04:00
Nicole Thomas	1a41b473ce	Merge pull request #49543 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-09-07 14:19:31 -04:00
Nicole Thomas	baafd6ec85	Merge pull request #49487 from garethgreenaway/49452_collections_abc ... [2018.3] Swapping out collections imports	2018-09-07 11:36:03 -04:00
Daniel Wozniak	06935e9211	Merge pull request #49528 from dwoz/mergetests ... Fix merge wart	2018-09-06 16:12:38 -07:00
Gareth J. Greenaway	3298e70607	Merge pull request #49548 from garethgreenaway/1075_disable_boto_tests_part_deux ... [2018.3] Disabling State boto tests for Python 3.7+	2018-09-06 14:50:09 -07:00
Gareth J. Greenaway	2fb3ef7195	Merge branch '2018.3' into 49452_collections_abc	2018-09-06 13:24:39 -07:00
Gareth J. Greenaway	0f5191ef7e	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. This PR is disabling the tests in the test_boto_vpc state tests.	2018-09-06 12:34:47 -07:00
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
Dmitry Kuzmenko	7eb8d6c374	Postgress module unit test fix.	2018-09-06 17:28:04 +02: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
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
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
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
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	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	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
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
rallytime	81a6155b6b	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:47:41 -04:00
rallytime	d06f6a5d3e	Use correct and explicit paths for salt utils libs	2018-09-04 10:02:34 -04:00
Gareth J. Greenaway	b27e86bd7d	Swapping out the version check for a try...except on the import from collections.abc with a fallback to importing from collections.	2018-09-03 16:30:21 -07:00
Mike Place	c69560ccb2	Merge branch '2017.7' into fix_win_service	2018-09-03 08:16:52 -06:00
Gareth J. Greenaway	d118a9fe53	Updating various imports that have been moved from collections to collections.abc, and will be deprecated in collections beginning in 3.8.	2018-09-02 13:08:23 -07:00
Daniel Wozniak	93df5c4f16	Merge pull request #49474 from dwoz/gitfs_unit ... Work around git-python resource leaks	2018-09-02 12:42:31 -07:00
Daniel Wozniak	1cdaea22b0	Merge pull request #49475 from dwoz/flaky_tests ... Fix a flaky test and mark another as flaky	2018-09-02 12:40:29 -07:00
Mike Place	43ead5d1bc	Merge pull request #49471 from Ch3LL/debug_sigusr1 ... Remove string conversion on frame object in sigusr1 handler	2018-09-02 12:05:12 -06:00
Daniel Wozniak	56068e9cd9	Merge branch '2018.3' into gitfs_unit	2018-08-31 15:55:52 -07:00
Nicole Thomas	764b816687	Merge pull request #49454 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-31 17:36:33 -04:00