92973 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Erik Johnson	db11317400	Add ability to run a shell command to depends decorator ... This adds the ability to suppress loading of a function based on the retcode of a command.	2018-04-12 18:02:21 -05:00
Mike Place	cbe1cfa4d9	Merge pull request #46684 from isbm/isbm-saltssh-multimajor-py-version-support ... SaltSSH cross-major version support	2018-04-11 12:31:31 -06:00
Mike Place	4e44fee506	Merge pull request #46022 from bloomberg/nested-orch-highstate ... salt.outputter.highstate: recursion for orch	2018-04-11 12:22:14 -06:00
Nicole Thomas	6e285fb8f2	Merge pull request #46994 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-04-11 14:03:31 -04:00
Nicole Thomas	62d49e8576	Merge pull request #46997 from LukeCarrier/fix-docker-slsbuild-typo ... Fix respository (=> repository) typo in sls_build	2018-04-11 11:53:32 -04:00
rallytime	b67e86e11b	Fix poor merge-conflict resolution: "translate_new_lines" doesn't exist in develop.	2018-04-11 10:48:48 -04:00
Nicole Thomas	1d1c9f71b5	Merge pull request #45313 from NTmatter/45274-trafficserver-popen-arguments ... modules.trafficserver: Use lists for popen's commands and arguments	2018-04-11 10:34:00 -04:00
Bo Maryniuk	515a83a72a	Set master_top_first to False by default	2018-04-11 16:20:32 +02:00
Nicole Thomas	6239033541	Merge pull request #47014 from brejoc/develop-fix-for-grain-test-core ... Test is now also working with Python2	2018-04-11 10:10:42 -04:00
Jochen Breuer	c22c81304f	Test is now also working with Python2 ... Since assertCountEqual was Python>=3.2 only, we backported this to Python2.	2018-04-11 10:51:20 +02:00
Nicole Thomas	d61fdd97fb	Merge branch 'develop' into nested-orch-highstate	2018-04-10 16:55:57 -04:00
Mike Place	511c8fa04d	Merge branch 'develop' into 45274-trafficserver-popen-arguments	2018-04-10 14:11:07 -06:00
Nicole Thomas	fa9c3c0e7c	Merge pull request #46515 from gtmanfred/develop ... allow excluding multiple directories in rsync	2018-04-10 14:34:02 -04:00
Luke Carrier	2df3b0d4ba	Fix respository (=> repository) typo in sls_build ... This typo looks to have been introduced with 64aa4fb and would affect anyone relying on the deprecated "name" attribute.	2018-04-10 19:24:19 +01:00
Nicole Thomas	fb035953f6	Merge pull request #46995 from s0undt3ch/develop ... [schedule][develop] Minor fixes and enhancements	2018-04-10 13:51:10 -04:00
Nicole Thomas	10e2771328	Merge pull request #46901 from cbosdo/purge_fix ... Purge fix	2018-04-10 13:06:23 -04:00
Daniel Wallace	5316e4bd90	allow excluding multiple directories in rsync	2018-04-10 10:30:54 -05:00
Pedro Algarvio	36442a4338	There's no need to pass the job name just for logging purposes.	2018-04-10 16:11:13 +01:00
Pedro Algarvio	f3495489a3	Advance _next_fire_time even when job didn't run	2018-04-10 16:11:13 +01:00
Pedro Algarvio	d3b6f59dfa	Pass keyword arguments by name	2018-04-10 16:11:13 +01:00
Cédric Bosdonnat	4fe489abea	Add parameter to virt.purge to keep removable images. ... Add a removables parameter to virt.purge to allow removing a VM without removing the attached (and potentially shared) ISO removable images (issue #46747).	2018-04-10 16:31:16 +02:00
Cédric Bosdonnat	668990082c	virt.get_disks outputs the disk type ... VM disks may also be floppies or cdroms. Output the libvirt device type as a 'type' attribute of the disk for consumers to spot removable devices (issue #46747).	2018-04-10 16:31:15 +02:00
rallytime	1ad8ed89ac	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/grains/core.py - salt/renderers/gpg.py	2018-04-10 10:16:50 -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	eb8e8a9876	Merge pull request #46657 from lvg01/fix-bug-46555 ... Changed destination for ipv6 in _ip_route_linux()	2018-04-10 09:57:11 -04:00
Nicole Thomas	a5a9fb391b	Merge pull request #46692 from mattp-/develop ... saltnado bugfixes for ldap & syndics	2018-04-10 09:54:20 -04:00
Nicole Thomas	2e69c336a6	Merge pull request #46888 from sieben/set_literal ... Declare set literally	2018-04-10 09:52:41 -04:00
Nicole Thomas	32f72595ae	Merge pull request #46928 from cbosdo/libvirt-events-fix ... Fix libvirt_events engine running on master	2018-04-10 09:48:31 -04:00
Nicole Thomas	ae7f4f71c8	Merge pull request #46933 from sjorge/46903 ... Only very recent zfs support parsable output	2018-04-10 09:43:46 -04:00
Nicole Thomas	9e06da47e3	Merge pull request #46955 from vtolstov/etcd ... fixes for etcd returner/utils/sdb	2018-04-10 09:42:31 -04:00
Nicole Thomas	9494b63824	Merge pull request #46967 from rallytime/fix-lint ... Revert changes from #46520 that were not merged-forward correctly	2018-04-10 09:35:07 -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	92d1979d7b	Merge pull request #46970 from garethgreenaway/917_pkgrepo_comments_fix ... [2017.7] fix to pkgrepo comments test	2018-04-10 09:25:01 -04:00
Bo Maryniuk	95739a16b0	Lintfix	2018-04-10 14:37:52 +02:00
Daniel Wallace	dd2fbfb21d	Merge pull request #46960 from Sikerdebaard/opennebula-template_clone-fix ... Added clone_images to OpenNebula template_clone kwargs	2018-04-10 07:33:34 -05:00
Bo Maryniuk	33a7a268ed	Use code checksum to update thin archive on client's cache	2018-04-10 11:52:19 +02:00
Bo Maryniuk	911df4733e	Fix unit tests for the checksum generator	2018-04-10 11:34:03 +02:00
Thomas Phil	5533a64dec	Added documentation for clone_images var in OpenNebula template_clone function	2018-04-10 10:17:33 +02:00
Thomas Phil	832f2589c6	Added clone_images to OpenNebula template_clone kwargs. If set to True images attached to the template are cloned as well	2018-04-10 09:55:08 +02:00
Jorge Schrauwen	36819172d6	Disable parsable output for zfs/zpool commands ... Only very recent zfs on linux supports parsable output for zfs/zpool commands. Also Oracle ZFS did not implement this at all. Since we now do value normalization, we can deal with not having parsable output.	2018-04-10 09:12:39 +02:00
Gareth J. Greenaway	438aafeb03	Adding kwargs to calls into file module functions	2018-04-09 19:50:04 -07:00
Gareth J. Greenaway	48ebbdab8a	Update test_pkgrepo.py	2018-04-09 19:40:43 -07:00
Nicole Thomas	133d0986be	Merge pull request #46958 from brejoc/develop-fix-for-grain-test-core ... Switch to assertCountEqual since order can change	2018-04-09 14:47:54 -04:00
Nicole Thomas	27d563742b	Merge pull request #46389 from Sygnia/lvresize ... linux_lvm module: refactor lvresize	2018-04-09 14:44:47 -04:00
Gareth J. Greenaway	7fb6d28a21	Removing debugging.	2018-04-09 11:38:17 -07:00
Gareth J. Greenaway	f22d91c9d4	Removing suse from pkgrepo comments tests. the pkgrepo functions in SUSE pkg module do not support comments.	2018-04-09 11:24:26 -07:00
rallytime	e3195e587d	Revert changes from #46520 that were not merged-forward correctly ... This removes the changes from #46520 that were merged-forward and not handled correctly in #46907. Changes to `salt/utils/schedule.py` cannot be merged forward to develop as the code there has be significantly refactored. The change in #46520 will need to be applied directly to `develop` instead.	2018-04-09 14:16:02 -04:00
Vasiliy Tolstov	839ed1f950	Merge branch 'develop' into etcd	2018-04-09 20:51:25 +03:00
Vasiliy Tolstov	115bd02cbb	returners/etcd: fix lint errors ... Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>	2018-04-09 20:50:25 +03:00
Mike Place	c3bcc27712	Merge pull request #46715 from pakdel/ec2_image_name ... Salt Cloud EC2: Image Name	2018-04-09 11:34:58 -06:00