93415 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	4b16537a29	Merge pull request #48579 from Ch3LL/fix_syslog ... Fix python2 syslog returner expecting string bytes not unicode	2018-07-13 15:50:15 -04:00
Nicole Thomas	3549ce408d	Merge pull request #48547 from gtmanfred/git.cloned ... fix git.cloned doc versionadded	2018-07-13 14:46:24 -04:00
Nicole Thomas	ee257a1f91	Merge pull request #48503 from rallytime/bp-46291 ... Back-port #46291 to 2018.3	2018-07-13 13:14:46 -04:00
Ch3LL	d8288a0ffc	add unicode type for syslog test for tag	2018-07-13 12:39:09 -04:00
Ch3LL	17e69382d5	Fix python2 syslog returner expecting string bytes not unicode	2018-07-13 12:35:41 -04:00
Nicole Thomas	2d923f2943	Merge pull request #48561 from garethgreenaway/48507_mysql_grants_incorrect_failure ... [2018.3] fixes to grants in mysql module	2018-07-13 10:24:57 -04:00
Gareth J. Greenaway	14c59da72c	Following a successful grant application in the MySQL module, the new grant and the desired grant are mismatched because the new grant from Mysql included hashmarks. This change adds the replace which is included for other items such as database name and username.	2018-07-12 12:40:57 -07:00
Nicole Thomas	5b5a930449	Merge pull request #48529 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-07-12 13:59:35 -04:00
Daniel Wallace	b596a945ea	Merge branch '2018.3' into git.cloned	2018-07-12 11:44:47 -05:00
Daniel Wallace	a95b8efd8a	Merge pull request #48553 from KaiSforza/jenkins-junit-2018 ... Set up junit in jenkins	2018-07-12 11:24:00 -05:00
William Giokas	412ffcc956	Set up junit in jenkins ... Moved the archive to the always statement. Doesn't change the junit stuff, but now we at least save the XML when we fail.	2018-07-12 10:20:27 -06:00
rallytime	8bc71688ea	Remove /sr.* pattern from test ... /sr.* pattern should raise exception	2018-07-12 11:24:44 -04:00
rallytime	5e2e2a63fa	Update file unit tests to handle "writelines" change ... Since file.line is now using "writelines()" instead of "write()", we need to handle the unittests accordingly.	2018-07-12 11:12:22 -04:00
rallytime	5d38aa8b33	Update file.line to use writelines instead of joining	2018-07-12 11:12:01 -04:00
rallytime	d0b6e82ecb	Add 'name' as the passed in filepath for test_line_insert_ensure_before_first_line test ... With 'foo', the test fails with an unknown file KeyError - we need to use the "name" variable instead. Fixes the test_line_insert_ensure_before_first_line test.	2018-07-12 11:11:47 -04:00
rallytime	d8920cb61f	Update test_line_insert_ensure_before_first_line to use new mock_open methodologies	2018-07-12 11:11:32 -04:00
rallytime	475f075d8e	Handle list of lines instead of strings in file.line func ... In `Fluorine`, in order to better handle line endings, the "body" variable has been changed to a list of strings. Therefore, we need to handle encoding or decoding the elements in the list, rather than using the `stringutils` functions.	2018-07-12 11:06:20 -04:00
Daniel Wallace	c4aed02740	Merge pull request #48551 from gtmanfred/2018.3 ... add posargs to tox pylint	2018-07-12 09:35:24 -05:00
Daniel Wallace	a6a286af28	add posargs to tox pylint	2018-07-12 09:34:47 -05:00
rallytime	f9b8c4b257	Use () when using with_tempfile decorator in tests	2018-07-12 09:48:40 -04:00
Daniel Wallace	e41f4922a0	fix git.cloned doc versionadded ... Closes #48542	2018-07-12 08:40:11 -05:00
Nicole Thomas	260da0d545	Merge pull request #48533 from terminalmage/sh-beacon ... Fix UnicodeDecodeError in sh beacon	2018-07-12 09:38:42 -04:00
Erik Johnson	7ac5ac06c9	Fix UnicodeDecodeError in sh beacon	2018-07-11 15:02:16 -05:00
Nicole Thomas	8761ac2589	Merge pull request #48520 from Lutseslav/fix-alter-databases-with-special-symbols ... Add quotes to schema name in ALTER DATABASE.	2018-07-11 15:15:08 -04:00
rallytime	d3190ca0c0	Update old utils paths to new utils paths	2018-07-11 14:52:54 -04:00
rallytime	29b05ffdd1	Merge branch '2017.7' into '2018.3' ... Conflicts: - doc/man/salt-api.1 - doc/man/salt-call.1 - doc/man/salt-cloud.1 - doc/man/salt-cp.1 - doc/man/salt-key.1 - doc/man/salt-master.1 - doc/man/salt-minion.1 - doc/man/salt-proxy.1 - doc/man/salt-run.1 - doc/man/salt-ssh.1 - doc/man/salt-syndic.1 - doc/man/salt-unity.1 - doc/man/salt.1 - doc/man/salt.7 - doc/man/spm.1 - pkg/windows/req.txt - tests/integration/runners/test_state.py - tests/integration/states/test_file.py - tests/integration/states/test_npm.py	2018-07-11 14:49:27 -04:00
Daniel Wallace	ad4f7efafd	Merge pull request #48528 from gtmanfred/2018.3 ... add 2018.3 requirements for tox/pytest tests	2018-07-11 13:13:40 -05:00
Daniel Wallace	221559358a	add 2018.3 requirements for tox/pytest tests	2018-07-11 13:08:49 -05:00
Daniel Wallace	0c0c05c2bc	Merge pull request #48527 from saltstack/revert-48525-2017.7 ... Revert "add kazoo for testing zookeeper."	2018-07-11 12:29:15 -05:00
Daniel Wallace	18d06c1a93	Revert "add kazoo for testing zookeeper."	2018-07-11 12:29:03 -05:00
Nicole Thomas	05bad3e71c	Merge pull request #48526 from twangboy/rollback_certifi-win32 ... Rollback python-certifi-win32	2018-07-11 13:26:55 -04:00
Mike Place	db066effe4	Merge pull request #48521 from Martin819/2017.7 ... Back-port #48222 to 2017.7	2018-07-11 10:42:50 -06:00
twangboy	361b3cdc2f	Rollback python-certifi-win32 ... It's causing issues with the test suite on Windows	2018-07-11 10:33:39 -06:00
Daniel Wallace	ed0bd2bbec	Merge pull request #48525 from gtmanfred/2017.7 ... add kazoo for testing zookeeper.	2018-07-11 11:09:40 -05:00
Gareth J. Greenaway	d088b00ff2	Merge branch '2018.3' into fix-alter-databases-with-special-symbols	2018-07-11 09:07:58 -07:00
Daniel Wallace	d7a6bff2b2	add kazoo for testing zookeeper.	2018-07-11 11:07:47 -05:00
Nicole Thomas	70e5fcb8a5	Merge pull request #48508 from rallytime/fix-file-bug ... [2018.3] Fix 2 bugs found in the file.check_perms function	2018-07-11 11:03:31 -04:00
Stanislav Lutsenko	59629e9757	Merge branch '2018.3' into fix-alter-databases-with-special-symbols	2018-07-11 17:26:57 +03:00
Martin Polreich	d5d01f6698	Fix for GlusterFS 4.0 and above	2018-07-11 16:08:30 +02:00
Nicole Thomas	ad5a959ab9	Merge pull request #48388 from garethgreenaway/48277_2017_7_file_roots_wrong ... [2017.7] reset file_roots for renderers after compile_pillar	2018-07-11 09:13:45 -04:00
Nicole Thomas	5a0b274bf1	Merge pull request #48389 from garethgreenaway/48277_2018_3_file_roots_wrong ... [2018.3] reset file_roots for renderers after compile_pillar	2018-07-11 09:13:32 -04:00
Nicole Thomas	38df812257	Merge pull request #48512 from gtmanfred/npm ... pin pm and grunt packages for npm tests	2018-07-11 09:06:05 -04:00
Nicole Thomas	04ba31147f	Merge pull request #48513 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.7 to 2017.7	2018-07-11 09:04:00 -04:00
Луценко Станислав	da8336712e	Add quotes to schema name in ALTER DATABASE. ... Fixes #48519 Driven by sql request error when schema contains dashes and some other special symbols.	2018-07-11 14:17:48 +03:00
Daniel Wallace	f0352ea95a	Merge pull request #48514 from gtmanfred/2017.7 ... upgrade dependencies for pytest tests	2018-07-10 15:53:54 -05:00
Daniel Wallace	739bf92599	upgrade dependencies for pytest tests	2018-07-10 15:52:50 -05:00
rallytime	a466a4880f	Merge branch '2017.7.7' into '2017.7' ... No conflicts.	2018-07-10 16:49:13 -04:00
Daniel Wallace	9ba0f6b3a0	pin pm and grunt packages for npm tests ... Until at least ubuntu 14 is dead.	2018-07-10 15:03:18 -05:00
Nicole Thomas	5372b60137	Merge pull request #48491 from grokrecursion/group-fix-v2 ... Group gid fixed as integer	2018-07-10 15:31:39 -04:00
rallytime	0747eb5476	Move comment string join and test/changes check to bottom of file.check_perms ... In 2018.3, file attribute checks were added to file.check_perms and then the mode checks were moved down lower in the function. However, there is some logic to handle original comments where the list of comments is joined into a single string. There is also some logic to return `None` when changes are present. This logic is (correctly) at the bottom of the file.check_perms function in the 2017.7 branch. This commit moves that logic back down to the bottom of the file.check_perms function for the 2018.3 branch. We need this logic at the bottom of the function for the following reasons: 1. We must wait to detect if changes occur until the very end. If changes occur during the file attribute check, then the `None` return will not get set when it should be. 2. We cannot join the comment strings together until all of the potential comments have been added to the comment list. Otherwise the function will stacktrace because you cannot `append` to a unicode type.	2018-07-10 14:23:15 -04:00