62565 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	6d3c04516f	Merge pull request #29200 from jfindlay/singular_umount ... mount state: unmount by device is optional	2015-11-25 13:03:22 -07:00
Mike Place	df7b35a86b	Merge pull request #29204 from lorengordon/fix-29202 ... Use os.path.join to return full path to ca bundle	2015-11-25 13:00:42 -07:00
Mike Place	fffcf9fef6	Merge pull request #29205 from trevor-h/fix-salt-cloud-winrm-ec2 ... Fixes #29187 - using winrm on EC2	2015-11-25 13:00:01 -07:00
Jorge Schrauwen	feafbeb0f9	implement zpool.healthy and update zpool.list	2015-11-25 19:58:41 +00:00
Mike Place	1937a47dec	Merge pull request #29170 from cachedout/refactor_pydsl_test ... Migrate pydsl tests to integration test suite	2015-11-25 12:56:48 -07:00
Justin Findlay	5de0b93ac6	saltutil.cmd module: do not shadow ret function argument ... Fixes #29161.	2015-11-25 12:32:36 -07:00
Justin Findlay	7809f2a389	saltmod.state state: do not shadow ret function argument	2015-11-25 12:32:35 -07:00
Thomas Phipps	c8fe514ec1	found 3 more spots where the profile was not being passed through.	2015-11-25 11:31:30 -08:00
Thomas Phipps	b2e3c1f8de	Merge pull request #1 from saltstack/2015.8 ... 2015.8	2015-11-25 11:17:52 -08:00
Trevor Hammond	48e0edd0d2	Fixes #29187 - using winrm on EC2	2015-11-25 18:36:45 +00:00
Thomas Desrosiers	56b3302fe9	Pylint fixes for PR #29139	2015-11-25 13:35:10 -05:00
Loren Gordon	b1dae5e6fe	Use os.path.join to return full path to ca bundle ... Fixes #29202	2015-11-25 13:34:44 -05:00
Mike Place	11d68f7b1c	Merge pull request #29198 from jfindlay/single_mtu ... rh_ip module: only set the mtu once	2015-11-25 11:11:09 -07:00
Mike Place	f19355e0bb	Merge pull request #29135 from jfindlay/ssh_except ... ssh_known_hosts.present state: catch not found exc	2015-11-25 11:10:43 -07:00
Mike Place	ccf46a44bb	Merge pull request #29185 from jirikotlin/develop ... Support of tunnels in openvswitch modules.	2015-11-25 10:55:35 -07:00
Mike Place	2477ff2eab	Add __init__ and pydsl test	2015-11-25 10:50:30 -07:00
Mike Place	d18ec83959	Merge pull request #29197 from s0undt3ch/develop ... We can't import functions as we import modules	2015-11-25 10:46:44 -07:00
Mike Place	a8c917e703	Merge pull request #29195 from pzipoy/dev/pzipoy/windows_dropfile_permissions ... Add windows dropfile support	2015-11-25 10:44:09 -07:00
Mike Place	89aee406fa	Merge pull request #29153 from DSRCompany/features/3077_acl_limit_args ... ACL limit args	2015-11-25 10:29:35 -07:00
Justin Findlay	b54de47b1b	mount state: unmount by device is optional ... Fixes #29140.	2015-11-25 10:25:19 -07:00
Mike Place	6a12197e13	Merge pull request #29196 from s0undt3ch/2015.8 ... We need novaclient imported to compare versions	2015-11-25 10:16:27 -07:00
Mike Place	063f075a99	Add integration renderer tests to the suite	2015-11-25 10:14:46 -07:00
Justin Findlay	0a8952f6ac	rh_ip module: only set the mtu once ... Fixes #29137.	2015-11-25 10:11:05 -07:00
Mike Place	0c0e15d4e9	Merge pull request #29059 from terminalmage/issue28072 ... Work around upstream pygit2 bug	2015-11-25 09:39:30 -07:00
Pedro Algarvio	f756296580	We can't import functions as we import modules	2015-11-25 16:32:31 +00:00
Mike Place	cc69c87dd2	Merge pull request #29112 from eliasp/ssh_known_hosts.present-backtrace-test ... Prevent backtrace (KeyError) in `ssh_known_hosts.present` state	2015-11-25 09:25:57 -07:00
Pedro Algarvio	78a7c34f2b	We need novaclient imported to compare versions	2015-11-25 16:25:55 +00:00
Mike Place	d8be61882e	Merge pull request #29158 from bocig/develop ... Fix custom hipchat api endpoint	2015-11-25 09:24:46 -07:00
Jiri Kotlin	55b81ade59	Support of tunnels in openvswitch modules - removed sudo from commands.	2015-11-25 16:22:52 +00:00
Perry Zipoy	02d9684f8b	Add windows dropfile support ... Signed-off-by: Perry Zipoy <perry.zipoy@ni.com>	2015-11-25 10:20:41 -06:00
Bastiaan Bakker	7052479ad3	remove trailing whitespace ... fix subdict_match test cases	2015-11-25 17:12:17 +01:00
Mike Place	7775d65089	Merge pull request #29178 from whytewolf/glance_keystone_profile_fix ... Profile not being passed to keystone.endpoint_get in _auth. so if a p…	2015-11-25 09:09:49 -07:00
Mike Place	b5b28fb51a	Merge pull request #29189 from sjorge/docs-fmadm ... doc fixes for salt.modules.fmadm	2015-11-25 08:56:39 -07:00
Bastiaan Bakker	e3af8d2151	fix issue 29191: only try partial matches when a wildcard has been specified	2015-11-25 16:03:33 +01:00
Jorge Schrauwen	ed95e84b2b	generate docs for fmadm module	2015-11-25 14:43:38 +00:00
Jorge Schrauwen	e3c5b21f26	add aditional doc info	2015-11-25 14:40:45 +00:00
Jiri Kotlin	2c07b5d516	Support of tunnels in openvswitch modules.	2015-11-25 13:30:49 +00:00
Jiri Kotlin	b2778b01a1	Support of tunnels in openvswitch modules.	2015-11-25 12:48:06 +00:00
Dmitry Kuzmenko	002b1ef9bd	Fixed use of assert_has_calls in tests. ... The method logic was changed in mock-1.1.0. This mades the use of the method compatible with both <1.1.0 and >=1.1.0	2015-11-25 15:31:20 +03:00
Dmitry Kuzmenko	09c4f69402	ACL test fix.	2015-11-25 12:33:46 +03:00
Thomas Phipps	807dd426a6	Profile not being passed to keystone.endpoint_get in _auth. so if a profiles are being used, then keystone.endpoint_get will not be able to authenticate causing glance to not be able to get it's endpoint.	2015-11-24 23:10:06 -08:00
David 425	01b4e47356	adding versionadded and fixing minor lint errors	2015-11-24 18:29:49 -08:00
Stephen Woodrow	c695a57ba9	Fix tests.	2015-11-24 18:09:12 -08:00
Stephen Woodrow	ff0e4fa2b9	Allow boto_elb to manage ELB backend policies.	2015-11-24 16:40:44 -08:00
Justin Findlay	345206b68e	Merge pull request #29173 from jfindlay/2015.8 ... add 2015.8.3 release notes	2015-11-24 17:07:51 -07:00
Justin Findlay	212f7dd281	add 2015.8.3 release notes	2015-11-24 17:06:40 -07:00
Justin Findlay	cafbb49cb6	add note on 2015.8.2 release notes	2015-11-24 17:05:41 -07:00
Colton Myers	8d07688af9	Merge pull request #29171 from basepi/merge-forward-develop ... Merge forward from 2015.8 to develop	2015-11-24 16:53:01 -07:00
Colton Myers	5e88e9e9c0	Merge pull request #29172 from basepi/philips_backport ... [2015.8] Backport new philips_hue proxy features from develop	2015-11-24 16:52:55 -07:00
Igor	1b75741eed	cleaned up lint errors	2015-11-24 15:52:08 -08:00