87095 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	63b664334b	Merge pull request #49578 from twangboy/fix_49566 ... Use setup.py clean --all	2018-09-10 12:27:05 -04:00
Mike Place	6a5a69c8be	Merge branch '2017.7' into fix_49566	2018-09-10 07:43:16 -06:00
Daniel Wallace	f9a01b72a0	Merge pull request #49584 from terminalmage/squelch-varstack-error ... Squelch error logging when varstack is not installed	2018-09-08 23:33:02 -05:00
Erik Johnson	c79a823964	Squelch error logging when varstack is not installed ... This gets rid of spurious errors when varstack isn't installed. Most people won't use this so these errors are not helpful.	2018-09-08 18:17:54 -05:00
Daniel Wozniak	d4d2b3658f	Merge pull request #49579 from dwoz/flaky_test ... Increase timeout for flaky git test	2018-09-07 20:32:48 -07:00
Daniel A. Wozniak	dbe40df7de	Increase timeout for flaky git test	2018-09-07 16:46:34 -07:00
twangboy	6105ebbebb	Use setup.py clean --all	2018-09-07 17:29:33 -06:00
Mike Place	5cbe60bc8d	Merge pull request #49570 from rallytime/doc-fixes ... Some small doc fixes I noticed when poking around in the saltnado files	2018-09-07 19:07:50 -04:00
rallytime	de80bda813	Fix docstring + import order, move pylint disable to own line	2018-09-07 16:10:06 -04:00
Nicole Thomas	5d267a2db9	Merge pull request #49547 from rallytime/bp-49518 ... Back-port #49518 to 2017.7	2018-09-07 14:21:49 -04:00
Ch3LL	d520f9acc1	Add tests with filname in token data	2018-09-07 13:55:26 -04:00
Ch3LL	d45f6c7866	Add empty token salt-api integration tests	2018-09-07 13:55:26 -04:00
Erik Johnson	652dbf63f4	Ensure that tokens are hex to avoid hanging/errors in cherrypy	2018-09-07 13:55:18 -04:00
Gareth J. Greenaway	4d865b4b9e	Merge pull request #49560 from rallytime/pkgng-fix ... [2017.7.8] Use correct path for is_true function	2018-09-07 09:31:35 -07:00
rallytime	f3e153443a	[2017.7.8] Use correct path for is_true function ... `data.py` does not exist in the salt/utils/ dir in the 2017.7 branch. We need to use the old path. This occurred from a backport and I missed the path change.	2018-09-07 10:44:30 -04:00
Nicole Thomas	49480710a6	Merge pull request #49549 from rallytime/codeowners-duplicate ... Remove duplicate comment in CODEOWNERS file	2018-09-07 09:42:09 -04:00
rallytime	393bc0fb59	Fix doc build errors in saltnado documentation	2018-09-07 09:39:34 -04:00
rallytime	4b257d298a	Remove duplicate comment in CODEOWNERS file	2018-09-06 16:55:16 -04:00
rallytime	4bb09f7910	Skip service module integration tests on CentOS 7 ... These are occassionally killing the SSH connection in our Jenkins tests. Let's skip them for now until we can delve more deeply into this.	2018-09-06 14:33:03 -04:00
Nicole Thomas	92369f06f6	Merge pull request #49541 from twangboy/fix_osx_build_2 ... Remove trusted host switches	2018-09-06 12:11:14 -04:00
twangboy	750d3fa29e	Remove trusted host switches	2018-09-06 09:59:46 -06: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
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
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
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
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	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	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
Mike Place	c69560ccb2	Merge branch '2017.7' into fix_win_service	2018-09-03 08:16:52 -06: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
Daniel A. Wozniak	f214929740	Fix a flaky test and mark another as flaky	2018-08-31 20:20:10 +00:00
Nicole Thomas	53e2e05766	Merge branch '2017.7' into fix_win_service	2018-08-31 13:40:37 -04:00
Nicole Thomas	52ab2c0574	Merge pull request #49466 from rallytime/bp-49461 ... Back-port #49461 to 2017.7.8	2018-08-31 11:44:10 -04:00
Mike Place	4ac4305c18	Merge pull request #49457 from rallytime/labels-docs ... Remove references to unused milestones in docs	2018-08-31 08:46:50 -06:00
Daniel Wallace	58428003b1	Revert "Allow for not being prompted to supply a password to deploy keys to a…"	2018-08-31 09:57:46 -04:00
Nicole Thomas	41dcc3f408	Merge pull request #49461 from saltstack/revert-47100-ssh ... Revert "Allow for not being prompted to supply a password to deploy keys to a…"	2018-08-31 09:55:34 -04:00
Daniel Wallace	0d7180a70e	Revert "Allow for not being prompted to supply a password to deploy keys to a…"	2018-08-30 16:22:29 -05:00
rallytime	d1e51db8d3	Remove references to unused milestones in docs	2018-08-30 15:12:34 -04:00
Nicole Thomas	cf3d2878f2	Merge branch '2017.7' into fix_win_service	2018-08-30 08:58:32 -04:00
Nicole Thomas	7a166bc58a	Merge pull request #49376 from twangboy/fix_48608 ... Fix issue with duplicates in user.list_users on OSX	2018-08-30 08:57:54 -04:00
Nicole Thomas	03d97507f6	Merge pull request #49434 from dwoz/cleanup_exception_handling ... Clean up exception handling on py3	2018-08-30 08:56:23 -04:00
Daniel Wallace	7099164fa8	Merge pull request #49389 from gtmanfred/2017.7 ... make file envs compatible with fileclient formats	2018-08-29 18:49:23 -05:00