91694 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
twangboy	82e17e5fc8	Fix args/kwargs	2018-04-10 14:45:29 -06:00
twangboy	455146500a	Move some functions into mac_utils	2018-04-10 14:45:28 -06:00
twangboy	125586264b	Add utils\mac_service.py	2018-04-10 14:45:28 -06:00
Nicole Thomas	6503bf8dfa	Merge pull request #46526 from Ch3LL/ip_conf ... Add tests for new source_* minion options	2018-04-10 15:56:45 -04:00
Nicole Thomas	03907d3fce	Merge pull request #46993 from L4rS6/fix-broken-keystone-auth/2018.3 ... Fix: tuple instead of string	2018-04-10 13:07:58 -04:00
Nicole Thomas	ffaee26540	Merge pull request #46990 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-04-10 13:07:32 -04:00
Nicole Thomas	a34b92ae82	Merge pull request #46339 from DSRCorporation/bugs/ssh_state_test_failures ... SSH State test failures	2018-04-10 13:06:50 -04:00
Ch3LL	c01180ff47	Patch ZMQ versions for master_uri test	2018-04-10 13:02:57 -04:00
Ch3LL	da38f332a5	Change comment and salt.utils.network import	2018-04-10 13:02:57 -04:00
Ch3LL	e972ebdf1a	Add for new source_* minion options	2018-04-10 13:02:57 -04:00
Nicole Thomas	9924100c44	Merge pull request #46989 from Ch3LL/redis_log ... Fix redis cache log debug line	2018-04-10 12:35:11 -04:00
Nicole Thomas	c6431936cb	Merge pull request #46848 from garethgreenaway/testing_jinja_filters_avaiable_via_salt_ssh ... [2018.8] salt-ssh jinja filters tests	2018-04-10 12:19:50 -04:00
Nicole Thomas	fbbcb7584c	Merge pull request #46973 from rallytime/fix-46880 ... New "apply_to" kwarg in rabbitmq module should be added at the end	2018-04-10 10:42:31 -04:00
rallytime	ccc5bad2df	Merge branch '2017.7' into merge-2018.3 ... Conflicts: - .kitchen.yml	2018-04-10 10:23:02 -04:00
Nicole Thomas	ba5421d988	Merge pull request #46991 from gtmanfred/windows ... use saltstack salt-jenkins	2018-04-10 10:18:59 -04:00
Daniel Wallace	98588c1dc5	use saltstack salt-jenkins	2018-04-10 09:15:50 -05:00
Lars Wagner	e33ba1b3d5	Fix: tuple instead of string	2018-04-10 16:12:54 +02:00
rallytime	2f1cf3e511	Merge branch '2017.7' into '2018.3' ... Conflicts: - .kitchen.yml	2018-04-10 10:11:35 -04:00
Ch3LL	6160bc06c6	Fix redis cache log debug line	2018-04-10 10:09:49 -04:00
Nicole Thomas	58f59cfbff	Merge pull request #46966 from terminalmage/issue46934 ... Fix traceback when attempting to decode binary data to unicode	2018-04-10 10:08:34 -04:00
Nicole Thomas	00c4067585	Merge pull request #46975 from gtmanfred/windows ... Make windows work for test runs in jenkinsci	2018-04-10 09:41:17 -04:00
Nicole Thomas	e33e792e2a	Merge pull request #46944 from garethgreenaway/46881_Cron_file_source_file_not_found ... [2018.3] cron.file with salt source URL	2018-04-10 09:34:02 -04:00
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	438aafeb03	Adding kwargs to calls into file module functions	2018-04-09 19:50:04 -07: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	1f69c0d7f8	make sure windows outputs xml junit files	2018-04-09 14:43:15 -05:00
rallytime	8ce21f982c	New "apply_to" kwarg in rabbitmq module should be added at the end ... The change in #41233 added the "apply_to" kwarg to rabbitmq.set_policy. Since the arg was not added at the end of the kwarg list, there was an API change. In addition, when the order of "apply_to" and "priority" was swapped, the corresponding kwargs were not changed, which causes a stack trace and the rabbitmq_policy state to fail. This change fixes #46880 so that the policy option will work correctly and we can avoid this API change for the module. In 2017.7.x versions of Salt, the order of args/kwargs is `vhost`, `name`, `pattern`, `definition`, `priority`, and then `runas`. Therefore, `apply_to` must be last. Fixes #46880	2018-04-09 15:19:28 -04:00
Daniel Wallace	4a2ec1bbb3	support new versions of winrm-fs	2018-04-09 12:12:14 -05:00
Erik Johnson	df43ffdb8f	salt.payload.Serial: fix traceback when unpacking binary blob	2018-04-09 11:35:46 -05:00
Erik Johnson	40a49358c9	gpg renderer: fix tranceback when decrypted ciphertext contains binary data	2018-04-09 11:34:50 -05:00
Erik Johnson	17a88f6a71	Include exc_info in pillar render errors to aid in troubleshooting	2018-04-09 11:33:56 -05:00
Nicole Thomas	3cf2353e41	Merge pull request #46945 from vutny/doc-faq-fix-jinja ... [DOC] Fix Jinja block in FAQ page	2018-04-09 09:05:27 -04:00
Gareth J. Greenaway	14d12b1d6b	Remove unused imports. Gating tests so they do not run on Windows	2018-04-08 10:39:49 -07:00
Gareth J. Greenaway	623d96f21a	Adding dummy cron file for integration/states/test_cron	2018-04-08 10:39:48 -07:00
Gareth J. Greenaway	c8e01871d6	Adding an integration test to test cron.file.	2018-04-08 10:39:48 -07:00
Gareth J. Greenaway	ddc55d8f9b	Fixing bug that made cron.file unable to use a file via a Salt URL.	2018-04-08 10:39:48 -07:00
Denys Havrysh	bfdf54e61d	[DOC] Fix Jinja block in FAQ page ... Closes #18835	2018-04-08 12:19:48 +03: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	fc2f728665	Merge pull request #46925 from terminalmage/fix-file.patch-docstring ... Remove reference to directory support in file.patch state	2018-04-06 09:54:46 -04:00
Nicole Thomas	eef6c518e1	Merge pull request #46900 from rallytime/bp-46801 ... Back-port #46801 to 2017.7	2018-04-06 09:47:43 -04:00