78189 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Daniel Wallace	38963d5a82	use transport if not set in state_file	2017-10-24 09:23:46 -06:00
Daniel Wallace	10e309a64f	which vagrant should go to stderr	2017-10-24 09:23:46 -06:00
Daniel Wallace	9307564de0	fix output columns	2017-10-24 09:23:46 -06:00
Daniel Wallace	2da22f87e1	test opennebula	2017-10-24 09:23:46 -06:00
Daniel Wallace	9f38f16905	add opennebula to Gemfile	2017-10-24 09:23:46 -06:00
Daniel Wallace	7465f9b27a	add script for copying back artifacts	2017-10-24 09:23:46 -06:00
Daniel Wallace	255118cfd7	run tests with kitchen	2017-10-24 09:23:44 -06:00
Sean Jenkins	6818f3631d	Fixes #39901 for RH/CentOS 7	2017-10-24 09:16:19 -06:00
Nicole Thomas	304dd2529d	Merge pull request #44160 from gtmanfred/directory ... add changes to test return	2017-10-23 10:35:20 -04:00
Erik Johnson	e10395483d	Merge pull request #44205 from rallytime/bp-44177 ... Back-port #44177 to 2016.11	2017-10-23 09:09:06 -05:00
Senthilkumar Eswaran	b9940f8521	Fixing default redis.host in documentation	2017-10-20 10:55:41 -04:00
Nicole Thomas	09ddfd0c08	Merge pull request #44167 from garethgreenaway/44140_debian_ip_fixes ... Fixes to modules/debian_ip	2017-10-20 10:25:38 -04:00
Daniel Wallace	a7d3d668f4	missed removing changes in the next test	2017-10-20 08:11:44 -06:00
Damon Atkins	04d03ea6b8	Updated comment	2017-10-20 18:12:55 +11:00
Damon Atkins	1dd565e585	Merge remote branch 'upstream/2016.11' into 2016.11_43417_Backport_and_Fixes	2017-10-20 18:11:51 +11:00
Mike Place	9f9e936b52	Merge pull request #43830 from rallytime/bp-43644 ... Back-port #43644 to 2016.11	2017-10-19 17:57:50 -05:00
Mike Place	07db6a3d8b	Merge pull request #43994 from oeuftete/fix-manage-runner-presence ... Fix manage.present to show lost minions	2017-10-19 17:27:58 -05:00
Mike Place	a07537e258	Merge pull request #44188 from terminalmage/issue44150 ... yumpkg: Check pkgname instead of name to see if it is a kernel pkg	2017-10-19 17:20:34 -05:00
Mike Place	715edc0cea	Merge pull request #44158 from rallytime/bp-44089 ... Back-port #44089 to 2016.11	2017-10-19 15:38:14 -05:00
Erik Johnson	0692f442db	yumpkg: Check pkgname instead of name to see if it is a kernel pkg ... We should have been checking pkgname instead of name all along, but this never bit us until 6638749 started passing `None` for the name param.	2017-10-19 13:54:03 -05:00
Daniel Wallace	ac0b5ec440	fix test	2017-10-19 09:28:59 -06:00
Gareth J. Greenaway	5f7555846f	When looping through the various pre, post, up and down commands put them into the interface dict using the right internet family variable.	2017-10-18 12:51:29 -07:00
Daniel Wallace	d3d00c3e62	add changes to test return	2017-10-18 11:25:44 -06:00
Vasili Syrakis	534faf0b7a	Catch on empty Virtualbox network addr #43427	2017-10-18 13:00:25 -04:00
Ken Crowell	f3980d7d83	Fix manage.present to show lost minions ... Fixes #38367 and and #43936.	2017-10-17 21:43:21 -03:00
Nicole Thomas	0cd493b691	Merge pull request #44131 from rallytime/bp-44029 ... Back-port #44029 to 2016.11	2017-10-17 11:05:38 -04:00
Matthew Summers	bebf301976	fixed test addressing issue #43307, disk.format_ to disk.format	2017-10-16 16:35:57 -04:00
Matthew Summers	b4ba7ae2fc	addresses issue #43307, disk.format_ to disk.format ... This change fixes breakage. It appears the disk.format_ func is aliased to disk.format in modules/disk.py	2017-10-16 16:35:18 -04:00
Mike Place	3a68e356f8	Merge pull request #44093 from gtmanfred/fix-44087 ... don't filter if return is not a dict	2017-10-16 13:13:18 -06:00
Nicole Thomas	c785d7a847	Merge pull request #44122 from cachedout/gpg_pr_template ... Add note about GPG signing to PR template	2017-10-16 15:09:37 -04:00
Nicole Thomas	bf90ea1f51	Merge pull request #44124 from rallytime/merge-2016.11 ... [2016.11] Merge forward from 2016.11.8 to 2016.11	2017-10-16 15:07:13 -04:00
Mike Place	e41e3d76be	Typo fix	2017-10-16 13:00:11 -06:00
Nicole Thomas	13f3ffa83a	Merge pull request #44097 from gtmanfred/openneb ... OpenNebula does not require the template_id to be specified	2017-10-16 14:36:16 -04:00
rallytime	59861291c8	Merge branch '2016.11.8' into '2016.11' ... No conflicts.	2017-10-16 13:29:07 -04:00
Mike Place	37c7980880	Add note about GPG signing to PR template	2017-10-16 10:03:02 -06:00
Mike Place	ac3e4df964	Merge pull request #44110 from roaldnefs/fix-doc-local-returner ... Format fix code example local returner doc	2017-10-16 09:57:49 -06:00
Roald Nefs	efd58f7594	Merge branch '2016.11' into fix-doc-local-returner	2017-10-16 16:29:22 +02:00
Roald Nefs	881f1822f2	Format fix code example local returner doc	2017-10-14 20:05:30 +02:00
Daniel Wallace	c29655b2c2	Merge branch '2016.11' into openneb	2017-10-13 19:36:07 -06:00
garethgreenaway	c960ca32c2	Merge pull request #44092 from techhat/awsunicode ... Made sure that unicoded data is sent to sha256()	2017-10-13 14:20:11 -07:00
Daniel Wallace	bd2490b149	OpenNebula does not require the template_id to be specified	2017-10-13 15:13:24 -06:00
Daniel Wallace	5455c5053b	fix pylint	2017-10-13 14:03:16 -06:00
Joseph Hall	bbd9db4d00	One more encoding	2017-10-13 10:04:50 -06:00
Joseph Hall	0e8b325667	Apparently __salt_system_encoding__ is a thing	2017-10-13 09:54:26 -06:00
Daniel Wallace	f749cafa25	don't filter if return is not a dict	2017-10-13 09:54:23 -06:00
Joseph Hall	1e7211838d	Use system encoding	2017-10-13 09:51:32 -06:00
Joseph Hall	1af21bbe5e	Made sure that unicoded data is sent to sha256()	2017-10-13 09:35:51 -06:00
Damon Atkins	dd48ba2616	Merge remote branch 'upstream/2016.11' into 2016.11_43417_Backport_and_Fixes	2017-10-13 10:55:55 +11:00
Nicole Thomas	d89c317d96	Merge pull request #44021 from whiteinge/cpstats-attribute-error ... Also catch cpstats AttributeError for bad CherryPy release ~5.6.0	2017-10-12 14:11:40 -04:00
Seth House	bf14e5f578	Also catch cpstats AttributeError for bad CherryPy release ~5.6.0	2017-10-12 09:50:22 -06:00