58381 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	9ea33bf0e4	Pylint fixes	2015-10-16 07:22:46 -06:00
Domingo Kiser	4af5b5c33f	introduce recurse_list pillar_source_merging_strategy	2015-10-16 05:24:40 -06:00
Mike Place	e15eeee2d3	Merge pull request #27984 from rallytime/version-clean-file ... Versionadded for clean_file option for pkgrepo	2015-10-15 12:57:54 -06:00
Mike Place	6efa71a482	Merge pull request #27989 from lyft/boto_vpc-main-route-association2-2015.8 ... Do not try to remove the main route table association	2015-10-15 12:57:42 -06:00
Ryan Lane	296931d29f	Do not try to remove the main route table association	2015-10-15 11:15:11 -07:00
Mike Place	7169fad02d	Merge pull request #27982 from pass-by-value/proxy_ssh_sample ... Add example for salt-proxy over SSH	2015-10-15 11:27:57 -06:00
Mike Place	d0be1ab98e	Merge pull request #27985 from jacobhammons/dot1 ... Changed current release to 8.1 and added CVEs to release notes	2015-10-15 11:27:05 -06:00
Jacob Hammons	236992b2be	Changed current release to 8.1 and added CVEs to release notes	2015-10-15 11:14:50 -06:00
rallytime	b094c8843e	Versionadded for clean_file option for pkgrepo ... Refs #19561	2015-10-15 11:08:46 -06:00
Aditya Kulkarni	b85f6ab339	Add example for salt-proxy over SSH	2015-10-15 11:27:01 -04:00
Nicole Thomas	7e4058605d	Merge pull request #27979 from cachedout/issue_27750 ... Fix regression with key whitespace	2015-10-15 09:26:08 -06:00
Nicole Thomas	6f8925ee84	Merge pull request #27977 from cachedout/issuse_27712 ... Decode unicode names in fileclient/server	2015-10-15 09:17:01 -06:00
Mike Place	fc1375fc39	Merge pull request #27981 from jtand/cloudstack-lint ... Fixed trailing whitespace lint	2015-10-15 09:10:15 -06:00
justinta89	5dfad190c2	Fixed trailing whitespace lint	2015-10-15 09:08:54 -06:00
Mike Place	1ae302b202	Merge pull request #27969 from jeffreyctang/logrotate_parse ... fix parse of { on next line	2015-10-15 09:04:33 -06:00
Erik Johnson	a4ba982b1d	Merge pull request #27978 from terminalmage/dockerng-inspect_image-docstring ... Add note about dockerng.inspect_image usage	2015-10-15 09:54:09 -05:00
Mike Place	12c6bf4358	Fix regression with key whitespace ... Port #22115 into 2015.8. Closes #27750	2015-10-15 08:44:33 -06:00
Erik Johnson	595f4a6939	Add note about dockerng.inspect_image usage ... Should clear up apparent confusion raised in https://github.com/saltstack/salt/issues/27976	2015-10-15 09:33:09 -05:00
Mike Place	5173ef43c8	Decode unicode names in fileclient/server ... Closes #27712	2015-10-15 08:21:29 -06:00
Jeff Tang	2c9b2bc367	lint fixes	2015-10-15 09:27:08 -04:00
Mike Place	bd9d1ed8b5	Merge pull request #27955 from pass-by-value/bp-27868 ... Bp 27868	2015-10-15 06:43:37 -06:00
Mike Place	c50802a80f	Merge pull request #27953 from The-Loeki/patch-1 ... Fix CloudStack cloud for new 'driver' syntax	2015-10-15 06:38:57 -06:00
Mike Place	7006c37627	Merge pull request #27965 from lyft/HOTFIX-boto-asg-fix ... Fail in boto_asg.present if alarms fail	2015-10-15 06:32:53 -06:00
Mike Place	6624ec1f48	Merge pull request #27958 from twangboy/update_win_task ... Added new functionality to win_task.py	2015-10-15 06:30:31 -06:00
Jeff Tang	8c6197d42e	fix parse of { on next line	2015-10-14 23:31:41 -04:00
Ryan Lane	b8f4079c33	Fail in boto_asg.present if alarms fail	2015-10-14 16:24:46 -07:00
Nicole Thomas	1efa87a964	Merge pull request #27959 from techhat/issue27956 ... Change __opts__ to self.opts	2015-10-14 16:29:13 -06:00
twangboy	6ecbdba246	Added run_wait function	2015-10-14 15:52:16 -06:00
Joseph Hall	bc01c48122	Change __opts__ to self.opts	2015-10-14 14:49:59 -06:00
twangboy	5731bdcadb	Clarified an error	2015-10-14 14:40:36 -06:00
twangboy	23b9c1c199	Added new functionality ... Added the following: - task.info - task.status - task.stop	2015-10-14 14:34:37 -06:00
Mike Place	877e217388	Merge pull request #27943 from rallytime/bp-27910 ... Back-port #27910 to 2015.8	2015-10-14 14:27:20 -06:00
Mike Place	5f6edc8ac2	Merge pull request #27944 from rallytime/bp-27909 ... Back-port #27909 to 2015.8	2015-10-14 14:26:51 -06:00
Aditya Kulkarni	c02ec8b943	Fix pylint errors	2015-10-14 16:25:35 -04:00
Aditya Kulkarni	6553d135d0	Add SSHConnection object	2015-10-14 16:25:35 -04:00
Ronald van Zantvoort	f0d5c9f375	Pop deprecated 'provider' into new 'driver' key ... Even that I can do @basepi :D	2015-10-14 22:12:06 +02:00
Ronald van Zantvoort	4e6b09edd1	Fix CloudStack cloud for new 'driver' syntax	2015-10-14 21:58:29 +02:00
Justin Anderson	f29ca5f87b	Merge pull request #27946 from jtand/pkgrepo-fix ... Changed grain to look at osmajorrelease instead of osrelease	2015-10-14 13:54:08 -06:00
justinta89	d88ac2589f	Changed grain to look at osmajorrelease instead of osrelease	2015-10-14 10:42:55 -06:00
rallytime	a3401c11b1	Clarify that apache2-utils is for Debian-based distros	2015-10-14 10:03:40 -06:00
twellspring	08b7bdeb97	Add dependency on apache2-utils	2015-10-14 09:59:58 -06:00
rallytime	33b3d8f5b3	Clarify that apache2-utils is for Debian-based distros	2015-10-14 09:52:22 -06:00
twellspring	8ca0bc823c	Add dependency on apache2-utils	2015-10-14 09:30:29 -06:00
Mike Place	bb900d428b	Merge pull request #27914 from rallytime/fix-27815 ... Use eipalloc instead of eni in EC2 interface properties example	2015-10-14 08:37:52 -06:00
Mike Place	679e603905	Merge pull request #27926 from rallytime/bp-27905 ... Back-port #27905 to 2015.8	2015-10-14 08:35:37 -06:00
Mike Place	3b4d86467b	Merge pull request #27927 from lyft/boto_secgroup-fixes-2015.8 ... Do not manage ingress or egress rules if set to None	2015-10-14 08:03:17 -06:00
Mike Place	b0f9db409d	Merge pull request #27928 from rallytime/bp-27908 ... Back-port #27908 to 2015.8	2015-10-14 08:00:50 -06:00
Erik Johnson	2d0b16559e	Merge pull request #27676 from ticosax/no-more-arg-to-docker-start ... [dockerng] WIP No more runtime args passed to docker.start()	2015-10-14 08:38:41 -05:00
Ryan Lane	0fedcc9a0b	Update docs	2015-10-13 15:53:22 -07:00
Ryan Lane	9cc65bba76	Do not manage ingress or egress rules if set to None	2015-10-13 15:51:11 -07:00