91644 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	5fcda3eff8	Merge branch '2018.3' into testing_jinja_filters_avaiable_via_salt_ssh	2018-04-10 09:25:45 -04:00
Gareth J. Greenaway	0adfee9b11	Updating a couple tests. Fixing check_whitelist_blacklist to work with PY3 when non-iterables are passed. Adding warning about lst_avg results being wrong and future updates in Neon.	2018-04-09 19:38:18 -07:00
Daniel Wallace	08e8782f76	Merge pull request #46937 from gtmanfred/2018.3 ... enable_ssh_minions does not work with subset yet	2018-04-06 21:54:55 -05:00
Gareth J. Greenaway	f3f42146ca	Removing expected from strftime and hashsum tests since the results are always different and we are only concerned about the filter being available.	2018-04-06 13:19:11 -07:00
Gareth J. Greenaway	860234c045	Fixing lint.	2018-04-06 13:19:11 -07:00
Gareth J. Greenaway	0891c6b580	fixing docstring	2018-04-06 13:19:10 -07:00
Gareth J. Greenaway	c8945e4b2e	cleaning up some imports.	2018-04-06 13:19:10 -07:00
Gareth J. Greenaway	0599759e5b	cleaning up some test doc strings.	2018-04-06 13:19:10 -07:00
Gareth J. Greenaway	dceda5eb88	Moving all jinja filter tests into support/jinja_filters.py. Updaitng integration/ssh/test_jinja_filters.py to use those tests. Adding integration/modules/test_state_jinja_filters.py to also use the common jinja filter tests.	2018-04-06 13:19:10 -07:00
Gareth J. Greenaway	07d7e3ca01	Adding a new integration test and corresponding state files to test availabilty of jinja filters when using salt-ssh.	2018-04-06 13:19:10 -07:00
Daniel Wallace	3fb75e903c	enable_ssh_minions does not work with subset yet ... This will fail if it selects the localhost minion as the subset minion.	2018-04-06 14:31:01 -05:00
Daniel Wallace	ac4e7cd73f	Merge pull request #46936 from gtmanfred/2018.3 ... don't copy __pycache__ or .pyc files for kitchen	2018-04-06 14:15:45 -05:00
Daniel Wallace	91474878fa	don't copy __pycache__ or .pyc files for kitchen	2018-04-06 14:15:02 -05:00
Nicole Thomas	8105fd9715	Merge pull request #46912 from gtmanfred/openstack ... pull latest vm data after building for openstack shade driver	2018-04-06 09:46:41 -04:00
Nicole Thomas	735ea12960	Merge pull request #46908 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-04-05 17:27:03 -04:00
Nicole Thomas	9a47afc33b	Merge pull request #46853 from terminalmage/date_format_filter ... Add back date_format filter	2018-04-05 16:33:49 -04:00
Daniel Wallace	5ef538f8ad	pull latest vm data after building for openstack shade driver	2018-04-05 15:15:38 -05:00
rallytime	102e966512	Remove redundant section in log setup	2018-04-05 15:09:48 -04:00
rallytime	177c686b52	Update old utils paths to new utils paths	2018-04-05 13:47:22 -04:00
rallytime	0a297e7319	Merge branch '2017.7' into '2018.3' ... Conflicts: - salt/grains/core.py - salt/utils/__init__.py	2018-04-05 13:43:51 -04:00
Erik Johnson	266d13a665	Add back date_format filter ... This was not removed from the docs, so it should be supported for the foreseeable future.	2018-04-05 11:52:47 -05:00
Nicole Thomas	d0f5b43753	Merge pull request #44926 from frogunder/whitelisted_acl ... whitelist_acl_test	2018-04-05 11:09:25 -04:00
Mike Place	7d822f9cec	Merge pull request #46464 from gtmanfred/orchestration ... fix salt subset in orchestrator	2018-04-05 09:52:00 -05:00
Mike Place	a064a3e695	Merge pull request #46882 from jasperla/smartos/backports ... Backport #46280 #46849 #46852 to 2018.3	2018-04-05 09:29:11 -05:00
Mike Place	4e5e291c99	Merge pull request #46873 from terminalmage/utf8-first ... Attempt UTF-8 first when decoding/encoding	2018-04-05 09:16:27 -05:00
Mike Place	805ed1c964	Merge pull request #46879 from dwoz/cloudtestfix ... Fix multiple typos causing tests to fail	2018-04-05 08:59:28 -05:00
Nicole Thomas	1518762465	Merge pull request #46878 from terminalmage/bp-46874 ... Backport #46874 to 2018.3	2018-04-05 09:26:03 -04:00
Nicole Thomas	67894e3ee9	Merge pull request #46869 from gtmanfred/2018.3 ... Always return dictionary for _localectl_status	2018-04-05 09:25:13 -04:00
Jasper Lievisse Adriaanse	47a66975ff	fix creating a nic tag on a link with double 0 in the MAC ... otherwise we get a message like '12:34:00:56:78:90 is not present on this system.' as dladm prints the '00' as '0' and we fail to correctly identify the existing interface. Fix a linting issue while here	2018-04-05 09:07:18 +02:00
Jasper Lievisse Adriaanse	a3cb0e576e	Unbreak creating etherstubs on SmartOS ... SmartOS (no longer?) handles setting an MTU for etherstub devices, so silently drop it in order to maintain the current API. salt:2066 salt % doas salt-ssh smartos-gz nictagadm.add storage0 etherstub smartos-gz: ---------- Error: Error: Cannot specify MTU for local nic tag Also fixup two examples while here which failed to run and use format() in a consistent manner. Tested on SmartOS 20160204T080230Z and 20180203T031130Z	2018-04-05 09:07:10 +02:00
Jasper Lievisse Adriaanse	e703254990	Remove unneeded checks for binaries in SmartOS modules ... This tidies the actual command string building and makes the code more readable in general. The required binaries are not likely to disappear after __virtual__ has been evaluated. Use correct nomenclature when referring to 'compute nodes'.	2018-04-05 09:06:53 +02:00
Nicole Thomas	58c8ff18e2	Merge pull request #46870 from cloudflare/proxy-doc ... Correct the documentation for two new proxy modules	2018-04-04 17:48:40 -04:00
Nicole Thomas	18e460fc30	Merge branch '2017.7' into whitelisted_acl	2018-04-04 17:28:40 -04:00
Daniel A. Wozniak	dc54fc53c3	Fix multiple typos causing tests to fail	2018-04-04 14:20:51 -07:00
Nicole Thomas	f70f6de282	Merge pull request #46647 from twangboy/win_fix_test_grains ... Fix the tear down function in integration.modules.test_grains	2018-04-04 17:14:05 -04:00
Nicole Thomas	91c078ce12	Merge pull request #46756 from nages13/bugfix-grain-virtual_subtype ... fix grains['virtual_subtype'] to show Docker on xen kernels	2018-04-04 16:53:49 -04:00
Nicole Thomas	058bbed221	Merge pull request #46799 from garethgreenaway/46762_prereq_shenanigans_tests ... [2017.7] Adding test for PR #46788	2018-04-04 16:41:22 -04:00
John Jawed	d9511d04d4	#43499, zmq setsockopt need to adapt python3	2018-04-04 15:32:34 -05:00
Nicole Thomas	d7e4b9d755	Merge pull request #46729 from terminalmage/expr_match ... Performance improvement/error catching in expr_match	2018-04-04 16:25:56 -04:00
Daniel Wallace	1496e985f7	fix pylint	2018-04-04 15:13:59 -05:00
Erik Johnson	cf28eb74aa	Don't log command when output_loglevel == 'quiet'	2018-04-04 14:57:45 -05:00
Daniel Wallace	637cdc6b7b	fix pylint	2018-04-04 14:37:04 -05:00
Nageswar	781f5030a4	Merge branch 'bugfix-grain-virtual_subtype' of https://github.com/nages13/salt into bugfix-grain-virtual_subtype	2018-04-04 19:12:00 +00:00
Nageswar	7e704c0e81	Moved down container check code below hypervisors to validate containers type running in virtual environment. ... Fixes #46754 & #43405	2018-04-04 19:09:05 +00:00
Nicole Thomas	e0b383afb5	Merge pull request #46872 from terminalmage/bp-46863 ... Backport #46863 to 2018.3	2018-04-04 15:04:39 -04:00
Nageswar	cd1ac4b7f9	Merge branch '2017.7' into bugfix-grain-virtual_subtype	2018-04-05 00:03:25 +05:30
Erik Johnson	f59cee28db	Remove hacky workarounds to get encode/decode tests to pass on Windows	2018-04-04 13:18:04 -05:00
Erik Johnson	76e5d81bb4	Remove hacky workaround to get Windows to decode deserialized data properly	2018-04-04 13:17:32 -05:00
Erik Johnson	0b5729e58a	Remove hacky workaround to get git state/exec module to work properly on Windows	2018-04-04 13:16:41 -05:00
Nicole Thomas	5c76d98d1a	Merge pull request #46850 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-04-04 14:07:44 -04:00