93184 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Nicole Thomas	1c1e4a4226	Merge pull request #47138 from dijit/patch-1 ... plaintext not supported in Windows Server 2016.	2018-04-18 11:35:17 -04:00
Nicole Thomas	7b0ced82fb	Merge pull request #47115 from cvedel/allow-ssh-host-in-vm-profile ... salt-cloud/vmware if specified use ssh_host to deploy	2018-04-18 10:13:13 -04:00
Christophe Vedel	c6a62966e6	only change ssh_host if necessary	2018-04-18 09:51:53 +02:00
Jan Harasym	df26cdc1d6	plaintext not supported in Windows Server 2016. ... ntlm authentication is backwards compatible to Windows Server 2008 at least, but plaintext is not supported in Server 2016.	2018-04-18 00:12:02 +02:00
Erik Johnson	09dcb8ffce	Merge pull request #47084 from bloomberg/26396-docpatch ... GH-26396, add a clarification on pillar merge strategy	2018-04-17 16:33:22 -05:00
Nicole Thomas	68aeb62a95	Merge pull request #47071 from beornf/vault-write-data ... Support return value when setting vault secret	2018-04-17 16:52:22 -04:00
Nicole Thomas	5fba2cbf78	Merge pull request #47072 from beornf/vault-wrapped-token ... Add wrapped token auth method for vault module	2018-04-17 16:51:13 -04:00
Nicole Thomas	ab8b12379b	Merge pull request #47078 from sjorge/zfsgrainnopool ... Ignore return code in zfs grains	2018-04-17 16:50:21 -04:00
Nicole Thomas	cdde25be86	Merge pull request #47091 from ixs/xen_pv_args ... Add Xen function to get and set PV_ARGS	2018-04-17 16:49:18 -04:00
Nicole Thomas	99debdd1cb	Merge pull request #47111 from terminalmage/default-renderer ... Update default renderer to jinja|yaml, improve renderer docs	2018-04-17 16:47:33 -04:00
Nicole Thomas	ac0656967c	Merge pull request #47123 from rallytime/merge-develop ... [develop] Merge forward from 2018.3 to develop	2018-04-17 16:46:37 -04:00
Nicole Thomas	56900be173	Merge pull request #47121 from pcjeff/develop ... fix pip import error in pip 10.0.0	2018-04-17 15:06:07 -04:00
rallytime	c85fa430f0	Update old utils paths with new utils paths	2018-04-17 11:54:43 -04:00
rallytime	abe2309c91	Merge branch '2018.3' into 'develop' ... Conflicts: - salt/netapi/rest_tornado/saltnado.py	2018-04-17 11:50:01 -04:00
Nicole Thomas	9e3fb7c7f2	Merge pull request #47082 from awerner/add-saltclass-recursive-pillars ... saltclass: added pillars to __pillar__ when encountered	2018-04-17 10:15:49 -04:00
Nicole Thomas	0403abcf76	Merge branch 'develop' into zfsgrainnopool	2018-04-17 10:15:00 -04:00
Jeff.JF Lin	e81cf80519	add ImportError	2018-04-17 22:09:04 +08:00
Nicole Thomas	aab92839d1	Merge pull request #47105 from terminalmage/issue46768 ... Add regex matches to expr_match unit tests	2018-04-17 10:05:07 -04:00
Nicole Thomas	b3cca1db3a	Merge branch 'develop' into vault-write-data	2018-04-17 10:03:27 -04:00
Matt Phillips	3755489e6b	GH-26396, add a clarification on pillar merge strategy ... make it clear what is required for yamlex behavior cross-sls.	2018-04-17 09:57:18 -04:00
Nicole Thomas	a52137ee36	Merge pull request #47109 from garethgreenaway/46943_slack_engine_fixes ... [2018.3] fixes to Slack engine	2018-04-17 09:56:26 -04:00
Nicole Thomas	6c16a34c44	Merge pull request #47045 from tankywoo/fix-gentoo-pkg-installed ... Fix ba7d00f5 for gentoo pkg.installed method	2018-04-17 09:55:44 -04:00
Nicole Thomas	a9d38ffbdb	Merge pull request #45970 from dxclabs/consul_remove_data_for_GET_requests ... stop 'data' being assigned with serialised empty dict for GET requests	2018-04-17 09:19:49 -04:00
Nicole Thomas	1336b62136	Merge pull request #47101 from sieben/fix_scaleway ... Use internal http.query library for HTTP requests	2018-04-17 09:05:59 -04:00
Jeff.JF Lin	00a48f4fc7	fix pip.req import error in pip 10.0.0	2018-04-17 18:37:09 +08:00
Christophe Vedel	eb918874ec	salt-cloud/vmware if specified use ssh_host to deploy ... Fixes #36543	2018-04-17 11:17:12 +02:00
Erik Johnson	7070a3be48	Update default renderer to jinja|yaml, improve renderer docs ... `yaml_jinja` and all legacy renderer syntax has been transparently translated to the render pipeline syntax (e.g `jinja|yaml`) under-the-hood for several years now, this just makes the default renderer adhere to the render pipeline syntax. It also makes significant improvements to the renderer documentation.	2018-04-16 22:35:23 -05:00
Mike Place	5852993f0f	Merge pull request #46825 from AAbouZaid/kapacitor_enhancements ... Follow up Kapacitor module enhancements.	2018-04-16 17:07:05 -06:00
Mike Place	3a22f72407	Merge pull request #47010 from terminalmage/issue40146 ... Rewrite file.patch state	2018-04-16 17:04:03 -06:00
Mike Place	86c7cfef56	Merge pull request #47053 from clan/jinja-error ... handle jinja error in <module> level	2018-04-16 16:47:54 -06:00
Mike Place	28563d8f58	Merge pull request #47054 from rallytime/stale-config-update ... Reduce the number of days an issue is stale by 10	2018-04-16 16:44:57 -06:00
Gareth J. Greenaway	02baa76595	Fixing a bug that occured when a comment was added to a message sent to Slack by Salt. Also making slack_engine:groups_pillar optional.	2018-04-16 15:39:20 -07:00
Mike Place	7bfa608e9f	Merge pull request #47062 from rallytime/merge-2018.3 ... [2018.3] Merge forward from 2017.7 to 2018.3	2018-04-16 13:58:31 -06:00
Mike Place	fa27e64a33	Merge pull request #47066 from terminalmage/issue46979 ... Fix regression in handling of environment/saltenv	2018-04-16 13:57:11 -06:00
Mike Place	6b388f6e8c	Merge branch 'develop' into vault-write-data	2018-04-16 13:51:51 -06:00
Mike Place	6554d58f6e	Merge branch 'develop' into vault-wrapped-token	2018-04-16 13:51:02 -06:00
Mike Place	4beed8c725	Merge pull request #47075 from sjorge/docfixvmadm ... Correct examples in smartos state docs to be valid yaml	2018-04-16 13:48:20 -06:00
Erik Johnson	44c564b6c0	Add regex matches to expr_match unit tests	2018-04-16 13:56:33 -05:00
Rémy Léone	640d5452e4	Use internal http.query library for HTTP requests	2018-04-16 18:27:46 +02:00
Mike Place	68a059421a	Merge branch 'develop' into zfsgrainnopool	2018-04-16 09:09:19 -06:00
Mike Place	c55c97527c	Merge pull request #47099 from sieben/cloud_providers_salt ... Add Scaleway to cloud providers examples	2018-04-16 08:44:14 -06:00
Rémy Léone	e11dca08ac	Add Scaleway to cloud providers examples	2018-04-16 15:43:03 +02:00
Campbell	5bdd5629bd	Update consul.py ... Added param comment regarding ignoring data for GET requests in _query.	2018-04-16 14:24:39 +01:00
Andreas Thienemann	6294cd02ed	Minor spelling fix: templat -> template	2018-04-16 14:44:52 +02:00
Andreas Thienemann	4ebf45952d	Add Xen function to get and set PV_ARGS ... PV_ARGS are used to pass additional commandline arguments to the kernel when running XenPV domains. The new actions can be run as follows: salt-cloud -a get_pv_args xenvm01 salt-cloud -a set_pv_args xenvm01 pv_args="utf-8 graphical"	2018-04-16 10:53:45 +02:00
Alexander Werner	bb96aaf057	saltclass: added node/class pillars to __pillar__ ... Add found pillars to the __pillar__ variable when encountered. This allows referencing other __pillar__ dynamically and also more complex jinja operations referencing in saltclass defined pillars.	2018-04-15 15:04:00 +02:00
Jorge Schrauwen	93be4c10cf	Ignore return code in zfs grains ... When there are no pools zpool list exists with 1. It's possible and OK to have zfs but no have any pools. ``` [ERROR ] Command '/usr/sbin/zpool list -H -o name,size' failed with return code: 1 [ERROR ] output: ```	2018-04-15 10:09:22 +02:00
Ahmed AbouZaid	4d96de6c59	add dbrp to define_task test	2018-04-14 23:00:42 +02:00
Jorge Schrauwen	ffce493646	Correct examples in smartos state docs to be valid yaml	2018-04-14 09:56:22 +02:00
Beorn Facchini	3934336b3b	Add wrapped token auth method for vault module	2018-04-14 15:56:30 +10:00