92442 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Wallace	7e30f459c9	rename boto to botomod	2018-05-22 12:49:47 -05:00
Nicole Thomas	19f4137b63	Merge pull request #47740 from garethgreenaway/46938_beacons_documentation ... [2018.3] Updating Beacon topic to include list based configuration for Beacons	2018-05-21 09:58:00 -04:00
Gareth J. Greenaway	5d23ef4dd8	Updating Beacon topic to include list based configuration for Beacons	2018-05-19 16:29:27 -07:00
Nicole Thomas	22807ac756	Merge pull request #47710 from terminalmage/fix-loader-whitelist ... salt.loader: add error logging when whitelist lookup fails	2018-05-18 12:56:18 -04:00
Erik Johnson	6192391b7b	Add additional missing modules to whitelist	2018-05-18 08:50:53 -05:00
Erik Johnson	7192c38f66	Change key -> function to make log message more clear ... Leaving it as "key" would potentially confuse people into thinking there was a problem with an SSH/SSL/TLS/etc. key.	2018-05-18 08:46:21 -05:00
Erik Johnson	91f9fd38fd	Fix loader whitelists in unit tests ... This resolves failed lazydict lookups in the tests due to improperly-set whitelists.	2018-05-17 16:43:36 -05:00
Erik Johnson	d4f2662e5b	Add error logging when whitelist lookup fails ... Rather than just raising a bare KeyError with no additional information, this raises a proper KeyError with the key that failed to be looked up. It also logs the key that failed to load, as well as the whitelist, to aid in troubleshooting.	2018-05-17 16:41:36 -05:00
Nicole Thomas	b91c0f5647	Merge pull request #47680 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2018.3.1 to 2018.3	2018-05-17 17:30:27 -04:00
Nicole Thomas	dbf12f9be2	Merge pull request #47545 from dmurphy18/fix_nonroot_build ... Fix non-root build and signing for rpm packages	2018-05-17 17:20:10 -04:00
Nicole Thomas	69056e5b67	Merge pull request #47572 from garethgreenaway/47546_archive_non_ascii_filenames ... [2018.3] archive module, filenames with Unicode characters	2018-05-17 16:41:10 -04:00
Gareth J. Greenaway	5e97b8b44a	Updating with requested changes.	2018-05-17 09:20:38 -06:00
Gareth J. Greenaway	cc1aa75a2f	only convert to bytes when using Python2	2018-05-17 09:20:38 -06:00
Gareth J. Greenaway	0fe32f4066	Updating integration/modules/test_archive to include filenames with unicode characters.	2018-05-17 09:20:38 -06:00
Gareth J. Greenaway	5a9cadd125	Accounting for when files in an archive contain non-ascii characters	2018-05-17 09:20:37 -06:00
rallytime	9b1773a763	Merge branch '2018.3.1' into '2018.3' ... Conflicts: - tests/integration/states/test_pip_state.py	2018-05-16 12:43:41 -04:00
Nicole Thomas	cb04d9c37e	Merge pull request #47661 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-05-16 11:53:35 -04:00
David Murphy	220f887fa6	Fixed review comment, changed file.chown to file.makedirs_perms	2018-05-16 09:48:22 -06:00
David Murphy	b15a1652b5	Changed versionadded from 2018.3.1 to 2018.3.2, to reflect when change should be accepted	2018-05-16 09:45:47 -06:00
David Murphy	90eb03e375	Additional error checking and minor cleanup	2018-05-16 09:45:47 -06:00
David Murphy	40d77e03d2	Correct building rpms with non-root user	2018-05-16 09:45:47 -06:00
Nicole Thomas	d17a16b648	Merge pull request #47672 from terminalmage/bp-47487 ... Backport #47487 to 2018.3	2018-05-16 09:55:39 -04:00
Nicole Thomas	9d4f5203a7	Merge pull request #47504 from mateiw/2018.3-salt-ssh-pillar-propagation-issue-47501 ... Fix pillar propagation in salt-ssh when overriding pillar in module.run + state.apply	2018-05-16 09:55:04 -04:00
Nicole Thomas	4fe78bbb9b	Merge pull request #47212 from weswhet/fix-macos-runas ... fix macOS running as user.	2018-05-16 09:54:22 -04:00
Nicole Thomas	0c7439a955	Merge pull request #47674 from terminalmage/issue47587 ... Fix regression in table outputter due to unicode types	2018-05-16 09:41:03 -04:00
Erik Johnson	43e3dcd398	Fix Python 3 incompatibility in table outputter ... `map(None, some_iterable)` is not valid usage in Python 3. This fixes that incompatiblity in a way that works in both Python 2 and 3.	2018-05-16 00:04:49 -05:00
Erik Johnson	d729656703	Add unit tests for table outputter	2018-05-16 00:02:14 -05:00
Erik Johnson	907d182dea	Fix regression in table outputter due to unicode strings ... This ensures that we use the proper justification functions from the unicode type on Python 2, and that we also normalize the input so that we are guaranteed that all strings are unicode types.	2018-05-15 23:53:20 -05:00
Ross Crawford-d'Heureuse	12abbfdcf7	bad ref to error fix	2018-05-15 21:34:52 -05:00
Nicole Thomas	fb3bf1ff3e	Merge pull request #47664 from rallytime/bp-47645 ... Back-port #47645 to 2018.3.1	2018-05-15 14:25:27 -04:00
Ch3LL	0a732d8e66	query the pip path for test test_issue_2087_missing_pip	2018-05-15 13:17:54 -04:00
rallytime	dd3e6f3f0a	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 - salt/states/pkgrepo.py	2018-05-15 12:29:29 -04:00
Nicole Thomas	d1a1a594e9	Merge pull request #47617 from aesposito91/2018.3 ... Update napalm.py	2018-05-15 11:44:34 -04:00
Nicole Thomas	049abe2850	Merge pull request #47649 from paulcollinsiii/sentry_docs ... Some additional details about Sentry for the docs	2018-05-15 11:41:35 -04:00
Nicole Thomas	8a21b864df	Merge pull request #47642 from garethgreenaway/unicode_update_salt_extend_templates ... [2018.3] Updating templates used by salt-extend for unicode goodness	2018-05-15 11:38:25 -04:00
Nicole Thomas	3ffa412ee5	Merge branch '2018.3' into 2018.3-salt-ssh-pillar-propagation-issue-47501	2018-05-15 11:15:02 -04:00
Nicole Thomas	9039fee104	Merge pull request #47647 from rallytime/bp-47601-and-47643-2018.3.1 ... Back-port #47601 and #47643 to 2018.3.1	2018-05-15 10:07:53 -04:00
Nicole Thomas	99f53c0a9f	Merge pull request #47603 from terminalmage/more-test-renaming ... Move/merge more test modules	2018-05-14 16:48:42 -04:00
Daniel A. Wozniak	7214fe17c8	Fix typo	2018-05-14 15:52:41 -04:00
Daniel A. Wozniak	506dceed17	Remove unwanted file	2018-05-14 15:52:35 -04:00
Daniel A. Wozniak	b6a21dfda3	use ignore-undefined-variable	2018-05-14 15:52:30 -04:00
Daniel A. Wozniak	2429f9fe8a	Ignore pylint WindowsError	2018-05-14 15:52:26 -04:00
Daniel A. Wozniak	2d63682fea	Better doc string	2018-05-14 15:52:22 -04:00
Daniel A. Wozniak	ec2adff699	Skip tests when we can not use runas	2018-05-14 15:52:17 -04:00
Paul Collins	2a8dfd65d7	Some additional details about Sentry for the docs ... Fixes #46871	2018-05-14 15:38:19 -04:00
Nicole Thomas	cc3daa88f3	Merge pull request #47640 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2018.3.1 to 2018.3	2018-05-14 13:59:05 -04:00
Nicole Thomas	f63d801858	Merge pull request #47639 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2017.7.6 to 2017.7	2018-05-14 13:58:24 -04:00
Nicole Thomas	db0eef3e8b	Merge pull request #47643 from dwoz/runas_detect ... Remove unwanted file	2018-05-14 13:53:56 -04:00
Daniel A. Wozniak	8c5e54b8b3	Fix typo	2018-05-14 10:30:04 -07:00
Daniel A. Wozniak	69bc88f1c6	Remove unwanted file	2018-05-14 09:48:31 -07:00