92221 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	17cfd4f7cf	Merge pull request #47507 from gtmanfred/2018.3 ... fix win_task for py3	2018-05-07 13:41:20 -04:00
Mike Place	a4c2df8fb2	Merge pull request #47472 from terminalmage/hashutils ... salt.utils.hashutils: Fix UnicodeEncodeError in several funcs	2018-05-07 08:31:06 -05:00
Daniel Wallace	19db39f402	fix win_task for py3 ... .keys() on python3 creates a dict_keys object which cannot be indexed like a list, if we just call list() on the dictionary we get a list of keys.	2018-05-07 08:11:52 -05:00
Daniel Wallace	8b0a370189	Merge pull request #47485 from gtmanfred/2018.3 ... add openstack modules to doc index.rst	2018-05-07 08:11:41 -05:00
Daniel Wallace	c86163d79f	add openstack modules to doc index.rst	2018-05-07 08:11:08 -05:00
Nicole Thomas	8df37f734a	Merge pull request #47482 from gtmanfred/2018.3 ... add all autodoc for new salt openstack modules	2018-05-04 17:03:37 -04:00
Daniel Wozniak	d20ca15c5d	Merge pull request #47447 from dwoz/strv ... Fix failing test due to windows console encoding	2018-05-04 09:41:29 -07:00
Erik Johnson	7266c9984d	salt.utils.hashutils: Fix UnicodeEncodeError in several funcs ... Many funcs in this module only convert the input to bytes on Python 3 because the hashing and base64-encoding funcs used in this module require bytes as input. However, on Python 2, to get bytes the input will be coerced to a str type if it is a unicode type. This will result in a UnicodeEncodeError when the unicode string contains non-ascii characters. This commit ensures that all input which is going to be encoded/hashed is converted to a bytes type first, and also ensures that all base64-encoded results are returned as a unicode string on Python 2 to conform with changes that have been made in 2018.3 to use unicode types where possible.	2018-05-04 11:13:29 -05:00
Daniel Wozniak	8c5b30b541	Merge pull request #47466 from dwoz/randbytes ... bytes file that decodes the same utf-8 and cp1252	2018-05-04 08:54:23 -07:00
Nicole Thomas	3658604c43	Merge pull request #47465 from rallytime/bp-47354 ... Back-port #47354 to 2018.3	2018-05-04 09:06:03 -04:00
Nicole Thomas	fa293f8fac	Merge pull request #47435 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-05-04 09:05:32 -04:00
Nicole Thomas	51d21afd4f	Merge pull request #47464 from dwoz/skiP_syslog_tests ... Skip tests not applicable to windows	2018-05-04 09:04:37 -04:00
Daniel Wozniak	3219430dcc	Merge pull request #47456 from dwoz/sysname ... Sysname returns text type	2018-05-03 19:57:49 -07:00
Daniel A. Wozniak	ca9393b7fb	Skip tests not applicable to windows	2018-05-03 19:55:46 -07:00
Daniel A. Wozniak	fd9bc06aab	bytes file that decodes the same utf-8 and cp1252 ... This replacement bytes file will decode with the same errors using cp1252 ad utf-8. Both will fail to decode the 1st, 3rd and 4th bytes.	2018-05-03 15:36:43 -07:00
Nicole Thomas	f3918514a7	Merge pull request #47458 from Ch3LL/unreleased_rn_2018 ... Add In Progress Warning for 2018.3.1 Release Notes	2018-05-03 16:40:46 -04:00
Tamas Pal	3df6fa7990	fix forward port of #46751 ... self.opts key 'environment' have been renamed to 'saltenv' after 2017.7, thus the forward port broke the 'same' merging strategy again.	2018-05-03 16:34:45 -04:00
rallytime	be0731da5f	Add skipIfs back in for rest_tornado tests ... These were removed in a downstream PR, #47415, and are now failing again in this merge forward. I will contact the OP about addressing this in 2018.3 as these test failures are not something I have been able to track down in a merge-forward PR.	2018-05-03 16:23:59 -04:00
Daniel A. Wozniak	8c01773833	Use the same non decodable bytes for all tests	2018-05-03 12:58:07 -07:00
Daniel A. Wozniak	983881a2a1	Add bytes that will not decode using cp1252	2018-05-03 12:28:38 -07:00
Ch3LL	6a261e5e3a	Add In Progress Warning for 2018.3.1 Release Notes	2018-05-03 12:47:30 -04:00
Daniel A. Wozniak	559ee1961f	Sysname returns text type	2018-05-03 09:16:21 -07:00
Nicole Thomas	9fbdcbe994	Merge pull request #47448 from dwoz/transport_import ... Fix missing import in test suite	2018-05-03 10:30:23 -04:00
Nicole Thomas	157a32af7f	Merge pull request #47410 from terminalmage/issue47260 ... gitfs: Fix identification of base env when saltenv mapping is disabled	2018-05-03 10:12:26 -04:00
Daniel A. Wozniak	7e04eb82e1	Fix missing import in test suite	2018-05-02 22:56:38 -07:00
rallytime	fd98ee3dc1	Lint: Add missing blank line	2018-05-02 16:50:36 -04:00
Erik Johnson	3ab332ad0e	Update tests to reflect bugfix	2018-05-02 15:21:39 -05:00
Erik Johnson	7b8127f336	gitfs: Fix identification of base env when saltenv mapping is disabled	2018-05-02 15:21:39 -05:00
rallytime	561718b20b	Update old is_windows utils path to new utils path	2018-05-02 15:04:53 -04:00
rallytime	a94cdf8a0d	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/daemons/flo/zero.py - salt/minion.py - salt/pillar/pillar_ldap.py - salt/transport/zeromq.py - salt/utils/async.py - salt/utils/zeromq.py - tests/integration/modules/test_service.py - tests/integration/netapi/rest_tornado/test_app.py - tests/unit/fileserver/test_gitfs.py - tests/unit/modules/test_pip.py	2018-05-02 15:00:40 -04:00
Nicole Thomas	7ae3497b0c	Merge pull request #47429 from gtmanfred/2017.7 ... server_list_min should use state, not status	2018-05-02 12:27:55 -04:00
Mike Place	091e4cf9a6	Merge pull request #47413 from saltstack/repobuild_improv ... Repobuild improvements for Ubuntu 18.04 lack of gpg2 and better error checking	2018-05-02 11:21:30 -05:00
Mike Place	2f5fc4ecc5	Merge pull request #47399 from isbm/isbm-zeromq17-deprecationwarning-2017.7.2-v2 ... zeromq 17 deprecation warning backport from 2018.3 + tornado 5 fixes	2018-05-02 10:11:15 -05:00
Daniel Wallace	8ae32033cc	server_list_min should use state, not status ... This is what is used when getting server names quickly.	2018-05-02 08:45:55 -05:00
Nicole Thomas	b14e974b5f	Merge pull request #47343 from Ch3LL/win_srv_test ... Add additional service module integration tests and enable for windows	2018-05-02 09:39:45 -04:00
Nicole Thomas	5e5774fd37	Merge pull request #47216 from twangboy/reg_docs ... Reg docs	2018-05-02 09:33:27 -04:00
David Murphy	c064032110	Removed extra spaces for pylint	2018-05-01 17:20:29 -06:00
Nicole Thomas	b0f3fb577f	Merge pull request #47375 from terminalmage/issue47310 ... Warn on use of virtual packages in pkg.installed state	2018-05-01 17:12:18 -04:00
Nicole Thomas	56235032f4	Merge pull request #47415 from kstreee/fix-local-client-tgt-bug ... Fixes a bug of rest_tornado's 'local' client, complement fix of #46326	2018-05-01 17:11:24 -04:00
Nicole Thomas	d65ceaee03	Merge pull request #47286 from baniobloom/vpc_peering_connection_name_fix ... fixed vpc_peering_connection_name option	2018-05-01 15:02:09 -04:00
Nicole Thomas	63baf4c4f8	Merge pull request #47417 from gtmanfred/slack ... revert instantiating a Caller Client in the engine	2018-05-01 14:58:06 -04:00
Nicole Thomas	0bdfaa5ffe	Merge pull request #47368 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-05-01 14:56:19 -04:00
kstreee@gmail.com	b8d37e0a1e	To add a test case for the syndic environment, copies the test case which was written by @mattp- that was already merged into develop branch, related pr is #46692.	2018-05-02 03:21:06 +09:00
Erik Johnson	fa2bea52bb	Remove extra blank line to appease linter	2018-05-01 13:11:19 -05:00
Erik Johnson	f8ab2be81c	Add debug logging if we fail to detect virtual packages	2018-05-01 13:11:19 -05:00
Erik Johnson	67c4fc56ac	Warn on use of virtual packages in pkg.installed state	2018-05-01 13:11:19 -05:00
kstreee	4627bad1fd	Realizes 'tgt' field into actual minions using ckminions to subscribe results of the minions before publishing a payload.	2018-05-02 02:20:56 +09:00
David Murphy	20c50b3331	Minor cleanup due to review comments	2018-05-01 11:05:12 -06:00
David Murphy	c143b359e9	Update for Ubuntu 18.04 lack of gpg2 and enhanced error checking	2018-05-01 11:05:12 -06:00
twangboy	0beeb58b16	Fix lint, add bytes	2018-05-01 10:37:02 -06:00