94003 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	069102b82d	Rename sentry returner test to match naming convention	2018-08-14 13:53:29 -05:00
Erik Johnson	23980830d1	Use tests.support.paths instead of deprecated integration module	2018-08-14 13:53:29 -05:00
Erik Johnson	ffb842d055	Move salt.utils.context tests to their proper location	2018-08-14 13:53:28 -05:00
Erik Johnson	d69069be13	Move context cache tests to their proper location	2018-08-14 13:53:28 -05:00
Nicole Thomas	b412bff534	Merge pull request #49110 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-14 13:11:24 -04:00
Mike Place	e78fc0e0eb	Merge pull request #48901 from garethgreenaway/48665_auth_ldap_valid_token_failed_auth ... [2018.3] fix to auth/ldap.py	2018-08-14 18:10:18 +02:00
rallytime	4649f60209	Update old utils paths with new paths	2018-08-14 09:52:40 -04:00
rallytime	49c2a784bb	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/modules/file.py - salt/modules/reg.py - salt/states/reg.py - tests/integration/states/test_file.py	2018-08-14 09:48:13 -04:00
Nicole Thomas	d46e23f4c2	Merge pull request #49109 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.8 to 2017.7	2018-08-14 09:10:46 -04:00
rallytime	3c5527f300	Merge branch '2017.7.8' into '2017.7' ... No conflicts.	2018-08-14 09:09:42 -04:00
Nicole Thomas	484c1e0123	Merge pull request #49099 from rallytime/bp-49085 ... Back-port #49085 to 2018.3	2018-08-14 08:42:50 -04:00
Daniel Wozniak	8954dd269f	Merge pull request #49090 from dwoz/file_line_fix ... Search for (but do not include) CRLF line ending	2018-08-13 15:00:33 -07:00
Daniel Wozniak	b99edc3dce	Merge pull request #49088 from dwoz/file_hash_diffs ... Multiple file state test fixes	2018-08-13 14:59:28 -07:00
Daniel Wozniak	274977b6c4	Merge pull request #49087 from dwoz/url_file_test_fixes ... Filter out scheme's that are not valid	2018-08-13 14:58:58 -07:00
Daniel Wallace	024d9cb843	fix async call to process manager	2018-08-13 16:51:21 -04:00
Nicole Thomas	bc033da677	Merge pull request #49071 from rallytime/bp-49034 ... Back-port #49034 to 2018.3	2018-08-13 16:15:30 -04:00
Nicole Thomas	90c2f026b3	Merge pull request #49077 from rallytime/bp-49075 ... Back-port #49075 to 2018.3	2018-08-13 15:59:59 -04:00
Nicole Thomas	6942ef1102	Merge pull request #49096 from rallytime/new-doc-img-2018.3 ... Update the DOCBANNER image for saltconf	2018-08-13 15:59:38 -04:00
rallytime	75080705ce	Update the DOCBANNER image for saltconf	2018-08-13 15:56:44 -04:00
Daniel A. Wozniak	0dca634e3c	Search for (but do not include) CRLF line ending ... When searching for a line in a file that has CRLF line endings, the normal $ regex will not match a line. With this change, we will match on but not include LF, CRLF, and the end of a file.	2018-08-13 12:35:01 -07:00
Daniel A. Wozniak	054afb8197	Multiple file state test fixes ... - Account for hash differences due to line endings - Ignore tests that are not valid on windows - Other test fixes due to line endings	2018-08-13 12:29:25 -07:00
Nicole Thomas	0e1ed7b923	Merge pull request #49055 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-08-13 15:20:10 -04:00
Nicole Thomas	db5fb3232a	Merge pull request #49086 from rallytime/new-doc-img ... Update the DOCBANNER image for saltconf	2018-08-13 15:11:50 -04:00
rallytime	90954203cb	Update the DOCBANNER image for saltconf	2018-08-13 15:10:56 -04:00
Daniel A. Wozniak	632b65f975	Filter out scheme's that are not valid ... We don't want to honor schemes that are not valid an example of this is a string like 'c:\\foo' will have a scheme of 'c' after being parsed.	2018-08-13 12:09:49 -07:00
Nicole Thomas	af6ec1dce2	Merge pull request #49045 from twangboy/fix_43164 ... Fix docs for the registry module and state	2018-08-13 14:48:21 -04:00
Nicole Thomas	db7ec46875	Merge pull request #49084 from rallytime/bootstrap-2018.3 ... [2018.3] Update bootstrap script to latest release	2018-08-13 14:14:41 -04:00
rallytime	28dc8ce954	[2017.7] Update bootstrap script to latest release	2018-08-13 14:13:16 -04:00
Nicole Thomas	a840fea1a1	Merge pull request #49083 from rallytime/bootstrap-2017.7 ... [2017.7] Update bootstrap script to latest release	2018-08-13 14:12:43 -04:00
rallytime	358e14cdac	[2017.7] Update bootstrap script to latest release	2018-08-13 14:10:28 -04:00
Daniel Wallace	5e07b8306b	fix last async issue	2018-08-13 12:25:49 -04:00
rallytime	83a15cb623	Add optimization_order config to mocked opts	2018-08-13 12:06:48 -04:00
Gareth J. Greenaway	8108a4d31a	Adding some tests for the grains, pillar and mine functions in the cache runner. These will also ensure that the relevant functions in salt.utils.master.MasterPillarUtil are functioning properly.	2018-08-13 10:47:47 -04:00
Nicole Thomas	b0d5acbe0d	Merge pull request #49052 from isbm/isbm-python37-support-2018.3 ... Python 3.7 support (backport 2018.3)	2018-08-13 09:06:50 -04:00
Nicole Thomas	338ecb70ef	Merge pull request #49026 from dwoz/issue_48557 ... Fix file.line line endings	2018-08-13 09:05:41 -04:00
Nicole Thomas	9db6cd5654	Merge pull request #49059 from twangboy/fix_37984 ... Fix docs for status.uptime on Windows	2018-08-10 17:30:38 -04:00
Nicole Thomas	f9db72f00c	Merge pull request #49061 from saltstack/revert-48982-new_logo_2017.7 ... Revert "New logo 2017.7 (WIP)"	2018-08-10 17:22:25 -04:00
Nicole Thomas	98a8da728b	Revert "New logo 2017.7 (WIP)"	2018-08-10 17:22:03 -04:00
Daniel Wallace	4386a9ca1f	Merge branch '2018.3' into isbm-python37-support-2018.3	2018-08-10 15:47:12 -05:00
twangboy	7ed45b5b00	Remove import	2018-08-10 14:41:19 -06:00
twangboy	7fb1edb469	Fix docs to clarify uptime output on Windows	2018-08-10 14:36:13 -06:00
Mike Place	bbcd1869ec	Merge pull request #48982 from newwebash/new_logo_2017.7 ... New logo 2017.7 (WIP)	2018-08-10 22:21:28 +02:00
twangboy	589456d08f	Fix lint errors	2018-08-10 12:50:01 -06:00
Nicole Thomas	602fed7806	Merge pull request #49038 from gtmanfred/slowtest ... disable enable_ssh_minions to see if it is slowing down 2018.3 tests	2018-08-10 14:07:59 -04:00
Nicole Thomas	01cf2c71ff	Merge pull request #49051 from rallytime/bp-49046 ... Back-port #49046 to 2017.7.8	2018-08-10 13:19:17 -04:00
Gareth J. Greenaway	d4e4f2e803	Fixing a typo in a comment.	2018-08-10 10:16:27 -07:00
Gareth J. Greenaway	2eb167ea42	Fixing issue when a valid token is generated even when invalid user credentials are passed. This change verifies that the binddn credentials are valid, then verifies that the username & password (if not None) are also valid.	2018-08-10 10:16:27 -07:00
rallytime	ea6883ee55	Update old utils paths to new utils paths	2018-08-10 13:15:53 -04:00
Daniel A. Wozniak	a4d22fda2f	Merge remote-tracking branch 'origin/issue_48557' into issue_48557	2018-08-10 10:12:55 -07:00
rallytime	201031fa8a	Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt.7 - doc/ref/configuration/minion.rst - salt/cloud/clouds/ec2.py - salt/returners/highstate_return.py - tests/support/gitfs.py - tests/unit/loader/test_loader.py	2018-08-10 13:12:14 -04:00