89526 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	b3b8e26b34	Merge pull request #45410 from s0undt3ch/oxygen ... Stop using the depracated `salt.utils.get_user()` function.	2018-01-12 09:48:03 -05:00
Pedro Algarvio	5cee46ec41	Stop using the depracated salt.utils.get_user() function.	2018-01-12 10:33:31 +00:00
Nicole Thomas	0e6cf84f65	Merge pull request #45392 from gtmanfred/oxygen ... Disable discovery in test suite	2018-01-11 16:14:19 -05:00
Daniel Wallace	065ae4e61f	increase timeout for starting daemons	2018-01-11 10:45:47 -07:00
Daniel Wallace	3cb91b4d63	disable discovery in test suite	2018-01-11 09:58:14 -07:00
Nicole Thomas	223470519d	Merge pull request #44830 from terminalmage/issue40776 ... Implement variable fileserver update intervals	2018-01-11 09:10:36 -05:00
Nicole Thomas	a37f7d7cd4	Merge pull request #45377 from terminalmage/py3-log-grains ... [PY3] add unicode_literals to log/grains modules	2018-01-10 15:14:23 -05:00
Erik Johnson	f900715e1c	[PY3] add unicode_literals to log/grains modules	2018-01-10 11:37:59 -06:00
Nicole Thomas	54dc7b76e5	Merge pull request #45340 from twangboy/win_fix_test_beacons ... Fix `unit.modules.test_beacons` for Windows	2018-01-10 12:10:52 -05:00
Nicole Thomas	32806d00b3	Merge pull request #45308 from twangboy/win_fix_test_state ... Fix `integration.modules.test_state` for Windows	2018-01-10 09:38:25 -05:00
twangboy	e3e0dba15d	Fix failing ubuntu test	2018-01-09 21:30:51 -07:00
Erik Johnson	de7eea42fb	Add test for modified virtualnames in salt.config	2018-01-09 19:11:17 -06:00
Erik Johnson	ef76bc6fcd	Update documentation for update intervals feature	2018-01-09 19:11:17 -06:00
Erik Johnson	958c99b87c	Move FS updates to their own process ... This removes fileserver updating from the maintenance process and puts them in a dedicated process. It also makes a couple changes reverting some unicode changes that I made a couple months ago. A class' name is never unicode in PY2.	2018-01-09 19:11:17 -06:00
Erik Johnson	16096bf0d3	Add update_intervals func to salt.fileserver.Fileserver ... Additionally, make "_gen_back" a public function, renaming it to "backends".	2018-01-09 19:11:17 -06:00
Erik Johnson	2d6760ee40	Add update_interval to gitfs, "fs" to several virtual names ... This also adds "fs" to all of the fileserver virtualnames which did not already have them. This both A) normalizes the usage of the non-roots backends, and B) makes it easier for the FileserverUpdate process to get the default update interval for each backend from the opts.	2018-01-09 19:11:17 -06:00
Erik Johnson	e192b422fb	Add versionadded	2018-01-09 19:11:17 -06:00
Erik Johnson	58ecddee5c	Docstring tweak	2018-01-09 19:11:16 -06:00
twangboy	53506a5e86	Fix some additional tests ... - Fix problem with invalid characters in requisites.prereq_simple2 - Fix problem with true/false commands in Windows. Need to use exit - Fix some issues with hard-coded paths to /tmp	2018-01-09 16:50:29 -07:00
twangboy	0be187cfe0	Move try except block	2018-01-09 15:23:51 -07:00
twangboy	db52f086e3	Fix some tests in integration.modules.test_state ... Fixes the following tests: - test_get_file_from_env_in_top_match - test_issue_1896_file_append_source - test_state_sls_id_test Fixes in issue in file.managed where a command execution error was being raised if the target file did not exist.	2018-01-09 15:21:58 -07:00
Nicole Thomas	f4e8d98a0e	Merge pull request #45275 from terminalmage/yumpkg-diff_attr ... yumpkg: don't use diff_attr when determining install/downgrade targets	2018-01-09 17:10:18 -05:00
Nicole Thomas	d5b3ab5587	Merge pull request #45273 from twangboy/win_fix_zfs_grain ... Fix issue with zfs_support grain on Windows	2018-01-09 16:35:54 -05:00
Nicole Thomas	12c0f99e8c	Merge pull request #45293 from terminalmage/py3-acl-auth-netapi ... [PY3] Add unicode_literals to acl, auth, and netapi modules	2018-01-09 16:32:59 -05:00
Nicole Thomas	888557c8c8	Merge pull request #45304 from twangboy/win_add_pythonnet ... Add pythonnet dependency for Windows	2018-01-09 16:32:17 -05:00
Nicole Thomas	56de7bcf5d	Merge pull request #45305 from terminalmage/py3-daemons ... [PY3] Add unicode_literals to daemons modules	2018-01-09 16:30:36 -05:00
Nicole Thomas	4919b9f27d	Merge pull request #45335 from twangboy/win_fix_test_load_beacon ... Skip test_load_match on Windows	2018-01-09 15:54:11 -05:00
Nicole Thomas	e402807cc0	Merge pull request #45332 from frogunder/fix_mac_archive_tests ... fix test_archive tests for mac	2018-01-09 15:49:12 -05:00
Nicole Thomas	14bdb68afc	Merge pull request #45333 from twangboy/win_fix_comment_line ... Fix `comment_line` for Py3 in Windows	2018-01-09 15:48:25 -05:00
Nicole Thomas	bf38bdca6c	Merge pull request #45280 from rallytime/merge-oxygen ... [oxygen] Merge forward from 2017.7 to oxygen	2018-01-09 15:37:52 -05:00
Nicole Thomas	227cdbda70	Merge pull request #45337 from twangboy/win_fix_test_core ... Fix `unit.grains.test_core` for Windows	2018-01-09 10:03:11 -05:00
Nicole Thomas	415b13666d	Merge pull request #45336 from twangboy/win_fix_test_masterapi ... Fix `unit.daemons.test_masterapi` for Windows	2018-01-09 10:02:32 -05:00
twangboy	fe2d4ae65b	Fix paths on Windows	2018-01-08 17:20:02 -07:00
twangboy	48f12a3bbc	Skip linux specific tests	2018-01-08 15:38:26 -07:00
twangboy	df0958e699	Fix decorator, fix asserts for Windows	2018-01-08 14:53:18 -07:00
twangboy	b49b52e113	Skip test_load_match on Windows	2018-01-08 14:31:46 -07:00
Nicole Thomas	981776b9ac	Merge pull request #45322 from Ch3LL/isci_test_mac ... Skip iscsi grains test if MacOSX	2018-01-08 16:28:13 -05:00
Nicole Thomas	0e2666bee5	Merge pull request #45326 from terminalmage/issue45243 ... PY3 compatibility: ensure we are passing a list instead of dict_values	2018-01-08 16:27:06 -05:00
twangboy	6b1b77f9ef	make wline a bytestring if py2 and windows	2018-01-08 13:32:48 -07:00
Frode Gundersen	9edca8a6cf	fix test_archive tests for mac	2018-01-08 20:18:52 +00:00
Nicole Thomas	29788617f1	Merge pull request #45306 from gtmanfred/rackspace ... Fix rackspace cloud test	2018-01-08 12:32:46 -05:00
Nicole Thomas	154c9255f5	Merge pull request #45316 from terminalmage/py3-engines ... [PY3] Add unicode_literals to engines	2018-01-08 12:08:57 -05:00
Nicole Thomas	438a16626a	Merge pull request #45317 from terminalmage/py3-config-executors ... [PY3] Add unicode_literals to config, executors	2018-01-08 12:07:08 -05:00
Erik Johnson	a0722fa934	PY3 compatibility: ensure we are passing a list instead of dict_values ... Fixes #45243.	2018-01-08 11:03:48 -06:00
Gareth J. Greenaway	68bf2b9f85	Merge pull request #45278 from gtmanfred/oxygen ... clean up for windows tests for kitchen-salt	2018-01-08 08:10:02 -08:00
Ch3LL	0919d8787b	Skip iscsi grains test if MacOSX	2018-01-08 10:54:45 -05:00
Erik Johnson	7c9d95a725	[PY3] Add unicode_literals to config, executors	2018-01-07 14:48:45 -06:00
Erik Johnson	0d975c335d	Add unicode_literals to engines	2018-01-07 14:01:48 -06:00
Daniel Wallace	a8341fea01	clean up for windows tests for kitchen-salt	2018-01-06 17:14:46 -07:00
Nicole Thomas	538d459b88	Merge pull request #45284 from twangboy/win_fix_build_env ... Put pywin32 dlls in correct location in buildenv scripts	2018-01-05 16:54:21 -05:00