92305 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Wallace	c86163d79f	add openstack modules to doc index.rst	2018-05-07 08:11:08 -05:00
Matei Albu	d67239aae7	--extra-filerefs include files even if no refs in states to apply ... Fixes #47496	2018-05-06 12:04:48 +02:00
Daniel A. Wozniak	3557fc5fa6	Fix crufty nssm.exe reference	2018-05-05 22:32:05 -07:00
Beth Parker	e0e2c9782d	Fixed lxc.clone unhandled exception in salt/modules/lxc.py ... Fixes #47322	2018-05-05 23:08:15 -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 Wallace	611ca1fc03	Merge pull request #47476 from gtmanfred/2017.7 ... Specify the cache directory for newer virtualenv modules	2018-05-04 14:20:44 -05:00
Daniel Wallace	1f91a85587	specify cache dir for pip install	2018-05-04 12:48:52 -05:00
Nicole Thomas	7c3f2c56da	Merge pull request #47412 from twangboy/fix_47125 ... Fix issue where the cwd was being removed	2018-05-04 13:28:10 -04:00
Nicole Thomas	4846e957c4	Merge pull request #47467 from twangboy/cleanup_settings ... Remove unused settings, update NSIS	2018-05-04 13:11: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
Daniel Wallace	99e150e09c	check for kitchen-vagrant gem before loading windows tests	2018-05-04 09:45:53 -05:00
Nicole Thomas	da9871d36b	Merge pull request #47196 from twangboy/fix_47024 ... Fix issues with pip	2018-05-04 10:23:03 -04:00
Mike Place	c9bab0b8e3	Merge branch '2017.7' into fix_47125	2018-05-04 09:14:06 -05:00
Nicole Thomas	e8c4524bae	Merge pull request #47455 from Ch3LL/unreleased_rn ... Add In Progress Warning for 2017.7.6 Release Notes	2018-05-04 09:44:54 -04: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
twangboy	9d498293b1	Remove unused settings, update NSIS	2018-05-03 16:46:03 -06: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
Nicole Thomas	2c7a4b6179	Merge pull request #47459 from gtmanfred/2017.7 ... update ubuntu-rolling to 18.04	2018-05-03 16:39:19 -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
Nicole Thomas	64a64c0ed7	Merge pull request #47462 from terminalmage/docs ... Fix docs build on Sphinx 1.7+	2018-05-03 16:06:56 -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
Erik Johnson	6d7803ece0	Fix docs build on Sphinx 1.7+ ... Sphinx 1.7 got rid of sphinx.utils.compat. This commit allows the builds to work both on both older and newer Sphinx.	2018-05-03 13:31:34 -05:00
Daniel Wallace	d228e72477	update ubuntu-rolling to 18.04	2018-05-03 12:02:22 -05: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
Ch3LL	b6d0cc2ab7	Add In Progress Warning for 2017.7.6 Release Notes	2018-05-03 12:06:15 -04:00
Nicole Thomas	6cd0d31c03	Merge pull request #47438 from lomeroe/double_admx_test ... lgpo fix for issue #47436	2018-05-03 10:40:26 -04: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
Aurélien Rouëné	3b02b0bdc1	Merge branch '2018.3' into fix-run-env-reset	2018-05-02 23:48:55 +02:00
Aurelien Rouene	ee2ab38c8c	Fix _run to reset LANGUAGE env variable ... Change cmdmod.py to reset LANGUAGE alongside with the LC_* variables	2018-05-02 23:41:06 +02:00
Nicole Thomas	ed69821d19	Merge pull request #47433 from s0undt3ch/2017.7 ... Add missing requirements files not commited in #47106	2018-05-02 16:57:13 -04: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
twangboy	14ee5537b9	Add @with_tempdir helper ... Fix two state tests Remove redundent tests	2018-05-02 12:17:36 -06:00
Pedro Algarvio	5abadf25d6	Add missing requirements files not commited in #47106	2018-05-02 18:34:09 +01:00
lomeroe	4902f1e2ba	check if a policy has either an enabled value or enabled list entry or ... a disabled value or disabled list entry when determining the state of the policy Some policies have one but not the other (in which case different entries in the registry.pol file are added for 'Enabled' or 'Disabled'). A partial fix for this was previously added, but did not check for all possible types when trying to determine if the policy is enabled/disabled and also did not perform the same check in the enabled/disabled list checks. This would result in some policies being reported by the module as Enabled even though they were disabled (for example "Windows Components\Internet Explorer\Make proxy settings per-machine (rather than per-user)" if set to 'Disabled' would report 'Enabled')	2018-05-02 11:43:51 -05:00