82813 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	78d826dd14	Fix regression in yum/dnf version specification ... Resolves #42774.	2017-08-08 13:55:35 -05:00
Nicole Thomas	ac752223ad	Merge pull request #42784 from gtmanfred/http ... only read file if ret is not a string in http.query	2017-08-08 13:20:12 -04:00
Nicole Thomas	44995b1abf	Merge pull request #42794 from lomeroe/bp-42744 ... Backport #42744 to 2017.7	2017-08-08 13:16:30 -04:00
lomeroe	0acffc6df5	fix #42600 in develop ... attempt to write data to regpol file even if data_to_write is empty (i.e. no policies configured)	2017-08-08 09:03:35 -05:00
Nicole Thomas	dcf474c47c	Merge pull request #42708 from cro/dont_change_args_during_memoize ... Do not change the arguments of the function when memoizing	2017-08-08 09:47:01 -04:00
Nicole Thomas	ddb671b8fe	Merge pull request #42783 from rallytime/fix-flaky-py3-test ... Sort lists before comparing them in python 3 unit test	2017-08-08 09:25:14 -04:00
Mike Place	d69822fe93	Merge pull request #42721 from hibbert/allow_no_ip_sg ... Allow no ip sg	2017-08-07 17:07:18 -05:00
Mike Place	bf7938fbe0	Merge pull request #42769 from terminalmage/issue42538 ... Fix domainname parameter input translation	2017-08-07 15:46:04 -05:00
Daniel Wallace	d397c90e92	only read file if it is not a string	2017-08-07 14:37:42 -06:00
rallytime	998834fbac	Sort lists before compairing them in python 3 unit test	2017-08-07 16:09:43 -04:00
Nicole Thomas	7bf2cdb363	Merge pull request #42388 from The-Loeki/patch-1 ... pillar.items pillar_env & pillar_override are never used	2017-08-07 13:51:47 -04:00
Nicole Thomas	9a8c9ebffc	Merge pull request #42770 from rallytime/merge-2017.7.1-into-2017.7 ... [2017.7] Merge forward from 2017.7.1 to 2017.7	2017-08-07 12:21:44 -04:00
Nicole Thomas	c765e528d0	Merge pull request #42768 from rallytime/merge-2017.7 ... [2017.7] Merge forward from 2016.11 to 2017.7	2017-08-07 12:21:16 -04:00
Erik Johnson	665de2d1f9	Fix domainname parameter input translation ... Resolves #42538	2017-08-07 09:51:14 -05:00
rallytime	6d17c9d227	Merge branch '2017.7.1' into '2017.7' ... No conflicts.	2017-08-07 10:39:19 -04:00
Nicole Thomas	3f5827f61e	Merge pull request #42651 from gtmanfred/2017.7 ... python2- prefix for fedora 26 packages	2017-08-07 10:35:04 -04:00
rallytime	0f75482c37	Merge branch '2016.11' into '2017.7' ... Conflicts: - salt/modules/rabbitmq.py - salt/netapi/rest_cherrypy/app.py - salt/netapi/rest_tornado/saltnado.py	2017-08-07 09:57:03 -04:00
Mike Place	7b2119feee	Merge pull request #42669 from garethgreenaway/42642_2016_11_augeas_module_fix ... [2016.11] Fixes to augeas module	2017-08-06 12:58:02 -05:00
Mike Place	791248e398	Merge pull request #42689 from hibbert/boto_efs_fix_tags ... boto_efs_fix_tags: Fix #42688 invalid type for parameter tags	2017-08-06 12:47:06 -05:00
garethgreenaway	1b3407649b	Merge pull request #42745 from terminalmage/issue42705 ... docker.compare_container: treat null oom_kill_disable as False	2017-08-05 08:28:19 -07:00
Erik Johnson	710bdf6115	docker.compare_container: treat null oom_kill_disable as False ... Resolves #42705.	2017-08-04 21:47:07 -05:00
Mike Place	5d5b22021b	Merge pull request #42704 from whiteinge/expr_form-warn-scope-bug ... Add import to work around likely multiprocessing scoping bug	2017-08-04 18:03:13 -05:00
garethgreenaway	888e954e73	Merge pull request #42743 from kkoppel/fix-issue-42741 ... Fix docker.compare_container for containers with links	2017-08-04 09:00:33 -07:00
garethgreenaway	de6d3cc0cf	Update dockermod.py	2017-08-04 08:59:33 -07:00
garethgreenaway	03a7f9bbee	Merge pull request #42710 from gtmanfred/syndic ... use subtraction instead of or	2017-08-04 08:14:13 -07:00
Kristjan Koppel	58b997c67f	Added a helper function that removes container names from container HostConfig:Links values to enable compare_container() to make the correct decision about differences in links. ... Fixes #42741	2017-08-04 15:35:41 +03:00
Mike Place	30725769ed	Merge pull request #42629 from xiaoanyunfei/tornadoapi ... tornado api	2017-08-03 17:21:19 -05:00
Mike Place	f0f00fcee1	Merge pull request #42655 from whiteinge/rest_cherrypy-reenable-stats ... Reenable cpstats for rest_cherrypy	2017-08-03 15:44:10 -05:00
Mike Place	005182b6a1	Merge pull request #42670 from gtmanfred/kube ... render kubernetes docs	2017-08-03 15:30:55 -05:00
Mike Place	df354ddabf	Merge pull request #42712 from twangboy/win_build_pkg ... Remove master config file from minion-only installer	2017-08-03 15:25:02 -05:00
Mike Place	21cf15f9c3	Merge pull request #42693 from gilbsgilbs/fix-rabbitmq-tags ... Fix RabbitMQ tags not properly set.	2017-08-03 15:23:08 -05:00
Daniel Wallace	683561a711	use subtraction instead of or ... If we use or, we will get minions that are in the ret list, but not connected to the master in cases where the syndic is used.	2017-08-03 09:02:49 -06:00
Daniel Wallace	8784899942	fix syntax	2017-08-03 09:02:09 -06:00
Daniel Wallace	178cc1bd81	make sure names are correct	2017-08-03 09:02:09 -06:00
Daniel Wallace	f179b97b52	add py3 for versionlock	2017-08-03 09:02:09 -06:00
Daniel Wallace	1958d18634	python2- prefix for fedora 26 packages	2017-08-03 09:02:09 -06:00
Daniel Wallace	bca17902f5	add version added info	2017-08-03 09:01:34 -06:00
Daniel Wallace	4bbfc751ae	render kubernetes docs	2017-08-03 09:01:34 -06:00
Mike Place	bb1dfd4a42	Merge pull request #42714 from cachedout/workaround_jnpr_test_bug ... Set fact gathering style to 'old' for test_junos	2017-08-03 08:39:39 -05:00
Andy Hibbert	f58256802a	allow_no_ip_sg: Allow user to not supply ipaddress or securitygroups when running boto_efs.create_mount_target ... Change-Id: I558de2e80e71399a442913f33fc69b5d84490361	2017-08-03 12:01:47 +01:00
Mike Place	834d6c605e	Set fact gathering style to 'old' for test_junos ... Without this, we stacktrace because it does not appear that setting 'gather_facts' to False prevents the library from assuming the presence of facts. I believe this to be an upstream bug with jnpr. Because they have listed this as being a deprecated option in the future this may re-break in the future.	2017-08-02 23:11:52 -06:00
twangboy	8604312a7b	Remove master conf in minion install	2017-08-02 17:12:02 -06:00
C. R. Oldham	a260e913b5	Do not change the arguments of the function when memoizing	2017-08-02 13:44:32 -06:00
Seth House	03b675a618	Add import to work around likely multiprocessing scoping bug ... Fixes #42649.	2017-08-02 12:51:59 -06:00
NLR	78fccdc7e2	Cast to list in case tags is a tuple.	2017-08-02 17:57:41 +02:00
NLR	287b57b5c5	Fix RabbitMQ tags not properly set.	2017-08-02 17:50:02 +02:00
Andy Hibbert	157fb28851	boto_efs_fix_tags: Fix #42688 invalid type for parameter tags ... Change-Id: Ibab5417074b1ac98ee025c421d04674070745edf	2017-08-02 15:59:08 +01:00
Seth House	deb6316d67	Fix lint errors	2017-08-01 14:17:13 -06:00
Gareth J. Greenaway	24413084e2	Updating the call to shlex_split to pass the posix=False argument so that quotes are preserved.	2017-08-01 12:40:31 -07:00
Mike Place	4c1d931654	Merge pull request #42481 from twangboy/win_unit_test_crypt ... Fix `unit.test_crypt` for Windows	2017-08-01 13:10:49 -05:00