90622 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Ignat Korchagin	18c42297f6	Allow gpg renderer to render multiple ciphertexts in a single string	2018-01-30 14:13:01 +00:00
Nicole Thomas	e45b27f015	Merge pull request #45752 from rallytime/merge-develop ... [develop] Merge forward from oxygen to develop	2018-01-29 12:34:50 -05:00
Erik Johnson	aa526d1076	Merge pull request #45746 from SolarisYan/patch-1 ... Update json.py	2018-01-29 09:54:41 -06:00
rallytime	502f031f60	Merge branch 'oxygen' into 'develop' ... Conflicts: - salt/utils/cloud.py	2018-01-29 09:37:19 -05:00
Nicole Thomas	41b76a222b	Merge pull request #45598 from nullify005/v2017.7.2-route53-apex ... Patch around ResourceRecords needing to be present for AliasTarget	2018-01-29 09:14:11 -05:00
Nicole Thomas	d6322d2e00	Merge pull request #45741 from terminalmage/squelch-error ... Squelch pyVmomi error in __virtual__ functions	2018-01-29 09:03:40 -05:00
Nicole Thomas	606cc1f1d8	Merge pull request #45697 from jasperla/hue ... philips_hue: extend docs and fix status with id	2018-01-29 08:59:45 -05:00
Nicole Thomas	35fbbb6857	Merge pull request #45737 from terminalmage/ssdp-unit-tests ... SSDP PY3 compatibility fixes	2018-01-29 08:50:11 -05:00
Solaris	f62e573629	Update json.py ... Hi, i'm reading the salt code,and i find a little bug here,is it?	2018-01-29 17:16:10 +08:00
Erik Johnson	991a91fe92	Squelch pyVmomi error in __virtual__ functions ... Logging an error in the __virtual__ causes an error to be logged EVERY TIME it is executed, which results in a lot of unnecessary logging. This reduces the log level to debug for these messages.	2018-01-28 17:20:22 -06:00
Lee Webb	34cbab3bd5	No lazy logging	2018-01-29 08:52:15 +11:00
Erik Johnson	293bdf2517	Merge pull request #45726 from rallytime/merge-oxygen ... [oxygen] Merge forward from 2017.7 to oxygen	2018-01-28 13:05:00 -06:00
Erik Johnson	c34a6f72cd	SSDP PY3 compatibility fixes	2018-01-28 11:09:20 -06:00
rallytime	ce3902b158	Merge branch '2017.7' into merge-oxygen	2018-01-28 08:51:03 -05:00
Nicole Thomas	eb91ae8b6e	Merge pull request #45734 from terminalmage/fix-trimmed-output ... Fix traceback in CLI output when value is trimmed	2018-01-28 08:35:56 -05:00
Nicole Thomas	d50140e0f2	Merge pull request #45725 from garethgreenaway/806_CentOS_7_Failing_CMDMOD_test ... [oxygen] Argument to struct.pack must be a bytescode not unicode with Python 2.7.5	2018-01-28 08:29:45 -05:00
Nicole Thomas	2969d86237	Merge pull request #45735 from terminalmage/shellcase-debug-logging ... Add debug logging to ShellCase functions	2018-01-28 08:27:20 -05:00
Nicole Thomas	863e105866	Merge pull request #45733 from terminalmage/rh-network-tests ... PY3-compatibility fix for RH networking module	2018-01-28 08:25:50 -05:00
Nicole Thomas	cc32a641b4	Merge pull request #45731 from terminalmage/arch-tests ... Fix groupadd tests for Arch Linux	2018-01-28 08:25:13 -05:00
Nicole Thomas	87a187da11	Merge pull request #45729 from terminalmage/tests ... Python 3 comptibility fixes	2018-01-28 08:24:25 -05:00
Jasper Lievisse Adriaanse	b1cfc168cb	philips_hue: extend docs and fix status with id	2018-01-28 14:22:36 +01:00
Erik Johnson	1cabf31a1f	Add debug logging to ShellCase functions ... Some of these have been failing in ways which are not reproducible locally. This adds debug logging so that we can check the salt-runtests.log for the return data, to aid in troubleshooting. NOTE: This also contains a fix for a bug in the CLI output handler that I think may have a chance of fixing some of these odd failures.	2018-01-27 20:55:34 -06:00
Erik Johnson	966ad07452	Fix traceback in CLI output when value is trimmed ... The comparison here was looking for the wrong string, causing the trimmed value not to be detected and leading to a traceback several lines later.	2018-01-27 20:48:41 -06:00
Nicole Thomas	c3b459cb0c	Merge pull request #45732 from terminalmage/struct-py2 ... Use bytestrings for struct.pack/unpack	2018-01-27 21:20:30 -05:00
Nicole Thomas	7516bfbffe	Merge pull request #45712 from bdrung/fix-version-decode ... Decode git call output in Python 3	2018-01-27 21:03:20 -05:00
Erik Johnson	e0c7fef313	PY3-compatibility fix for RH networking module ... Encoding on Python 3 produces a bytestring, when what we need is a unicode string.	2018-01-27 19:39:27 -06:00
Gareth J. Greenaway	bdb01fabc9	Adding b'' to the struct.unpack calls.	2018-01-27 15:41:17 -08:00
Gareth J. Greenaway	9bbe60832b	Swapping out str() for b'' instead.	2018-01-27 15:35:21 -08:00
Gareth J. Greenaway	ec86cfde0e	Argument to struct.pack must be a string not unicode.	2018-01-27 15:35:21 -08:00
Erik Johnson	f60183b95c	Use bytestrings for struct.pack/unpack ... https://github.com/saltstack/salt/pull/45687 and https://github.com/saltstack/salt/pull/45725 fixed problems with older Python 2 versions interacting with the struct module, since unicode_literals turned the format strings to unicode and older Python 2 releases can't accept a unicode format string. Since Python 2 and 3 both support using bytestrings for the format strings, this commit makes sure we are using bytestrings everywhere else we are using struct.pack/unpack.	2018-01-27 17:34:16 -06:00
Erik Johnson	227fcbf794	Fix groupadd tests for Arch Linux ... The default /etc/login.defs does not have a value assigned to MOTD_FILE, which causes a traceback in 2 of the tests.	2018-01-27 17:02:23 -06:00
Erik Johnson	604ac80e7f	PY3-compatibility fix after unicode_literals was enabled	2018-01-27 16:30:29 -06:00
Erik Johnson	b1ae012852	Remove unnecessary additional assert ... It looks like this was just written to assert the output of a failed call to `ip.down`, which raises a KeyError at this point of the test because it is not within the `with` block in which this function is mocked.	2018-01-27 16:30:29 -06:00
Erik Johnson	730eabac29	PY3-compatibility fixes in TLS module ... This fixes the following tests: - unit.modules.test_tls.TLSAddTestCase.test_create_ca - unit.modules.test_tls.TLSAddTestCase.test_create_ca_signed_cert - unit.modules.test_tls.TLSAddTestCase.test_create_csr - unit.modules.test_tls.TLSAddTestCase.test_create_pkcs12 - unit.modules.test_tls.TLSAddTestCase.test_create_self_signed_cert - unit.modules.test_tls.TLSAddTestCase.test_pyOpenSSL_version_destructive - unit.modules.test_tls.TLSAddTestCase.test_recreate_ca - unit.modules.test_tls.TLSAddTestCase.test_recreate_ca_signed_cert - unit.modules.test_tls.TLSAddTestCase.test_recreate_csr - unit.modules.test_tls.TLSAddTestCase.test_recreate_pkcs12 - unit.modules.test_tls.TLSAddTestCase.test_recreate_self_signed_cert	2018-01-27 16:30:29 -06:00
Erik Johnson	e2b8ec9255	Merge pull request #45713 from isbm/isbm-oxygen-unicode-S3171 ... Move to unicode (3rd tier, tests)	2018-01-27 15:44:08 -06:00
Erik Johnson	c1b367dcb0	Merge pull request #45717 from isbm/isbm-oxygen-unicode-S3173 ... Move to unicode (3rd tier, tests)	2018-01-27 15:43:21 -06:00
Erik Johnson	28e2a6a9d2	Merge pull request #45723 from rallytime/merge-develop ... [develop] Merge forward from oxygen to develop	2018-01-27 15:30:47 -06:00
Erik Johnson	7115cd9d39	Don't import text_type directly so it doesn't get added to lazyloader	2018-01-27 14:50:16 -06:00
Erik Johnson	a1bfab5289	Merge branch 'isbm-isbm-3136-unittests-to-discovery' into oxygen	2018-01-27 14:49:10 -06:00
Erik Johnson	fbcd9f1ef0	Merge branch 'isbm-3136-unittests-to-discovery' of https://github.com/isbm/salt into isbm-isbm-3136-unittests-to-discovery	2018-01-27 14:48:35 -06:00
Nicole Thomas	91b848debb	Merge pull request #45720 from dwoz/issue-44449-prod-fix ... Salt cloud adds newly created insances to cache	2018-01-26 17:45:42 -05:00
Nicole Thomas	831698f066	Merge pull request #45724 from eliasp/2017.7-typo-from-hell ... Typo (`Hellium` → `Helium`)	2018-01-26 17:37:44 -05:00
rallytime	0ea728bd06	Update old utils paths to new paths	2018-01-26 17:34:29 -05:00
rallytime	0ad101d560	Merge branch '2017.7' into 'oxygen' ... Conflicts: - doc/man/salt.7 - salt/modules/git.py - salt/modules/pacman.py - salt/states/git.py - tests/integration/modules/test_mac_user.py - tests/support/parser/__init__.py	2018-01-26 17:27:03 -05:00
Nicole Thomas	cdb21a0186	Merge pull request #45722 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2018-01-26 17:15:40 -05:00
Elias Probst	bec78276f3	Replace left-over mistyped codename reference (Hellium → 2014.7.0)	2018-01-26 22:52:10 +01:00
rallytime	cbf1ed2f97	Merge branch 'oxygen' into 'develop' ... Conflicts: - salt/cloud/clouds/joyent.py - salt/modules/cmdmod.py	2018-01-26 16:28:01 -05:00
Nicole Thomas	f7949a5b23	Merge pull request #45704 from terminalmage/tests ... Fix 9 tests on Python 3	2018-01-26 15:40:41 -05:00
rallytime	8e3a2e25fe	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/git.py	2018-01-26 15:17:56 -05:00
Nicole Thomas	99e6043166	Merge pull request #45698 from terminalmage/salt.exceptions-traceback ... Fix traceback when exception instances are passed to our custom exceptions	2018-01-26 15:04:56 -05:00