91763 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	508659b682	yamlloader: Properly handle colons in inline dicts ... PyYAML's scanner is not written to handle Python's unicode literal strings, since they are not part of the YAML spec. With all strings loaded in the YAML context now being unicode types, this causes errors when scanning the document to construct the next node. The unicode string literal is misidentified as a plain scalar and any colons within it are interpreted as delimiting a mapping node. Since no whitespace appears after the colon, this causes scanning error. To fix it, we check for this scanning error and reset the scanner's position and check if the first char is the "u" prefix. If so, and if the following char is a quote, then we attempt to scan for a string literal instead.	2018-04-16 11:29:51 -05:00
Nicole Thomas	8761b81a69	Merge pull request #47051 from rallytime/fix-lint ... Simplify LooseVersion check in `__virtual__` check in mac_assistive module	2018-04-13 15:43:32 -04:00
Nicole Thomas	bbb8018b55	Merge pull request #47057 from corywright/fix-minionfs-whitelist-docs ... Fix copy/paste typo in minionfs tutorial	2018-04-13 15:43:00 -04:00
Cory Wright	9b7ee97d12	Fix copy/paste typo in minionfs tutorial	2018-04-13 11:52:41 -04:00
Nicole Thomas	d5afa4a2c5	Merge pull request #47046 from clan/file_diff ... switch order of file to be diffed	2018-04-13 09:40:12 -04:00
Nicole Thomas	ec9251ecd3	Merge pull request #47048 from OrlandoArcapix/Issue46985-fix-grafana4-state ... Issue46985 fix grafana4 state	2018-04-13 09:34:28 -04:00
Nicole Thomas	d8c4c221cf	Merge pull request #47017 from Unity-Technologies/hotfix/pip_windows ... Don’t encode a unicode string	2018-04-13 09:31:32 -04:00
rallytime	d52b3689d9	Simplify LooseVersion check in __virtual__ check in mac_assistive module	2018-04-13 09:17:43 -04:00
Orlando Richards	259d747414	Remove accidentally added copy of a file	2018-04-13 11:29:35 +01:00
Orlando Richards	6c8c3da74d	Return an empty dict instead of 'None' from grafana4 states ... Fixes #46985	2018-04-13 09:55:54 +01:00
Z. Liu	bb58605c54	switch order of file to be diffed	2018-04-13 07:00:24 +00:00
Mike Place	5b7544eaa0	Merge pull request #47019 from rallytime/bp-46919 ... Back-port #46919 to 2018.3	2018-04-12 13:43:00 -06:00
Mike Place	ac2d54d78a	Merge pull request #47029 from terminalmage/issue46859 ... ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types	2018-04-12 13:41:28 -06:00
Nicole Thomas	e6e07720fa	Merge pull request #46930 from dwoz/crptodomekeyfix ... Clean up bad public key headers	2018-04-12 14:57:36 -04:00
Nicole Thomas	0e43becc12	Merge pull request #47008 from garethgreenaway/46951_fixing_slack_engine_aliases ... [2018.3] Fixing aliases in slack engine	2018-04-12 11:24:39 -04:00
Nicole Thomas	c33de7c82d	Merge pull request #47009 from garethgreenaway/46947_slack_documentation_update_catch_non_dicts ... [2018.3] fixes to slack engine documentation	2018-04-12 11:20:53 -04:00
Gareth J. Greenaway	f2e484ed54	Merge branch '2018.3' into crptodomekeyfix	2018-04-12 08:12:00 -07:00
Nicole Thomas	68d17c71f1	Merge pull request #47023 from rallytime/bp-46997 ... Back-port #46997 to 2018.3	2018-04-12 11:05:23 -04:00
Nicole Thomas	9cf3c6406a	Merge pull request #47026 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-04-12 10:39:40 -04:00
Daniel Wallace	d3be828696	Merge pull request #47021 from garethgreenaway/920_state_module_jinja_filters_test_test_path_which ... [2018.3] Fixing integration.modules.test_state_jinja_filters.StateModuleJinjaFiltersTest.test_path_which	2018-04-12 08:12:38 -05:00
Nicole Thomas	66e8445b82	Merge pull request #47022 from corywright/add-auth-file-module-to-docs ... Add auth.file module to auth documentation page	2018-04-11 17:11:09 -04:00
Erik Johnson	ab6314247b	ldapmod.py/ldap3.py: Force modlist for search/modify/etc. to be str types	2018-04-11 14:55:48 -05:00
Erik Johnson	7691dee4ed	Add to_str option to decode funcs ... This allows for the string to be forced to a str type instead of unicode on PY2.	2018-04-11 14:41:54 -05:00
rallytime	ba70df9d62	Use msgpack utils for loads call, import msgpack for UnpackValueError	2018-04-11 14:38:32 -04:00
rallytime	34a478dfe5	Update old fopen path with new utils files path	2018-04-11 12:44:04 -04:00
rallytime	590c7fc13f	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/state.py - salt/utils/files.py - tests/integration/modules/test_pip.py	2018-04-11 12:41:22 -04:00
Luke Carrier	c2c60f4ffc	Fix respository (=> repository) typo in sls_build ... This typo looks to have been introduced with 64aa4fb and would affect anyone relying on the deprecated "name" attribute.	2018-04-11 11:54:30 -04:00
Cory Wright	bd0918fc40	Add auth.file module to auth documentation page	2018-04-11 11:40:00 -04:00
Gareth J. Greenaway	2ccf2c5fe0	Fixing test_path_which to check that the filter is available rather than results.	2018-04-11 08:19:07 -07:00
Nicole Thomas	12ecfdee93	Merge pull request #45774 from twangboy/mac_add_service_util ... Fix __virtual__ issue in mac_system.py	2018-04-11 10:26:12 -04:00
Nicole Thomas	8f994e7cf9	Merge pull request #46539 from jfoboss/patch-1 ... #46504 Fix	2018-04-11 10:13:23 -04:00
Nicole Thomas	79347f108a	Merge pull request #47012 from terminalmage/issue46953 ... Azure: ensure subscription_id is a str type	2018-04-11 09:57:07 -04:00
Adam Bolte	6837d6c138	Replace failing is and is not tests with == and != ... With the introduction of unicode_literals, these str to unicode comparisons were incorrectly always returning False. Fixes #46917.	2018-04-11 09:55:18 -04:00
Daniel Hobley	838670f626	Don’t encode a unicode string ... - We can’t encode once it’s already encoded	2018-04-11 15:18:39 +02:00
Erik Johnson	5192622a32	Azure: ensure subscription_id is a str type ... Resolves #46953.	2018-04-11 02:21:27 -05:00
jfoboss	6890122e41	Merge pull request #1 from twangboy/pull_46539 ... Fix unit test for win_ntp	2018-04-11 10:01:53 +03:00
Gareth J. Greenaway	f0fadbb4ce	Fixing indention for slack documention. Updating try..except to ensure we catch when groups aren't dicts.	2018-04-10 17:52:08 -07:00
Gareth J. Greenaway	dc2a72d44f	Fixing aliases in slack engine	2018-04-10 17:42:07 -07:00
Nicole Thomas	74d70e95a5	Merge pull request #46999 from gtmanfred/2017.7 ... switch pip test package	2018-04-10 17:18:32 -04:00
twangboy	5796696617	Fix tests for Py3 ... readPlistFromString has been deprecated on Python3. Use loads instead.	2018-04-10 14:45:32 -06:00
twangboy	7b40218790	Fix lint, remove sentence from docstring	2018-04-10 14:45:32 -06:00
twangboy	781880f0fc	Add _available_services function for testing	2018-04-10 14:45:31 -06:00
twangboy	6080633613	Add assert_called_with	2018-04-10 14:45:31 -06:00
twangboy	1bf70b2033	Add more tests for available_services	2018-04-10 14:45:30 -06:00
twangboy	b429fc3e74	Add tests for mac_utils ... Need help with the `available_services` tests	2018-04-10 14:45:30 -06:00
twangboy	b5f67130cc	Used *args and **kwargs	2018-04-10 14:45:30 -06:00
twangboy	ed061617a2	Fix unicode_literal issue in mac_assistive	2018-04-10 14:45:29 -06:00
twangboy	82e17e5fc8	Fix args/kwargs	2018-04-10 14:45:29 -06:00
twangboy	455146500a	Move some functions into mac_utils	2018-04-10 14:45:28 -06:00
twangboy	125586264b	Add utils\mac_service.py	2018-04-10 14:45:28 -06:00