61260 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jacob Hammons	8ec5d989ad	2015.8.8 release docs	2016-03-23 14:00:30 -06:00
Mike Place	553ecaca25	Merge pull request #32023 from sbreidba/bugfix_32004 ... Move constant declaration into member variable to avoid issues when m…	2016-03-21 14:18:23 -06:00
Mike Place	65c634d197	Merge pull request #32026 from techhat/decodeout ... Don't require the decode_out file to already exist	2016-03-21 14:17:05 -06:00
Joseph Hall	f27da41b71	Don't require the decode_out file to already exist	2016-03-21 13:15:31 -06:00
Skip Breidbach	711a0a9844	Move constant declaration into member variable to avoid issues when modules can't be loaded.	2016-03-21 09:37:57 -07:00
Nicole Thomas	1d4246bfd7	Merge pull request #32019 from rallytime/bp-32012 ... Back-port #32012 to 2015.8	2016-03-21 09:54:31 -06:00
Nicole Thomas	d117db3efb	Merge pull request #32015 from ticosax/fix-port-comparison-udp ... [dockerng] Fix ports exposition when protocol is passed.	2016-03-21 09:22:19 -06:00
Josh Fraser	26eee1505f	There were two identical blocks concerning Windows Deploy Timeouts. This ... pull request removes the extra block of text.	2016-03-21 09:08:21 -06:00
Nicolas Delaby	e511864a55	Fix ports exposition when protocol is passed. ... fixes #32013	2016-03-21 10:44:22 +01:00
Nicole Thomas	c72ab6a073	Merge pull request #31999 from jacobhammons/mock-modules2 ... Fixes a doc build exception caused by missing mocks for modules.win_dacl	2016-03-19 09:49:40 -06:00
Jacob Hammons	31bb573abc	Fixes a doc build exception caused by missing mocks for modules.win_dacl	2016-03-18 17:43:36 -06:00
Nicole Thomas	398ab909f0	Merge pull request #31992 from notpeter/2015.8 ... salt-cloud: add D2 and G2 EC2 instance types	2016-03-18 15:37:21 -06:00
Peter Tripp	e3854c8569	D2 and G2 EC2 instance types.	2016-03-18 13:38:49 -07:00
Mike Place	ad8ada7eef	Merge pull request #31981 from lloydoliver/linux-disk-grain-fix ... include rotational disks in grains under linux	2016-03-18 09:54:00 -06:00
Mike Place	9be508e8f0	Merge pull request #31970 from twangboy/fix_win_file ... Add apply_template_on_contents for windows	2016-03-18 09:37:29 -06:00
Nicole Thomas	810c6dbcbe	Merge pull request #31960 from aletourneau/2015.8_ec2-getconsoleoutput ... fixed ec2 get_console_output	2016-03-18 09:13:47 -06:00
Nicole Thomas	1c7dc364ad	Merge pull request #31958 from rallytime/merge-2015.8 ... [2015.8] Merge forward from 2015.5 to 2015.8	2016-03-18 09:12:43 -06:00
Lloyd Oliver	9c44604438	include rotational disks in grains under linux	2016-03-18 12:00:29 +00:00
twangboy	dfeae191c1	Add apply_template_on_contents for windows	2016-03-17 16:40:55 -06:00
Nicole Thomas	b9d0336cf8	Merge pull request #31964 from jfindlay/2015.8 ... update 2015.8.8 release notes	2016-03-17 15:22:04 -06:00
Justin Findlay	b984659678	update 2015.8.8 release notes	2016-03-17 15:07:10 -06:00
Alexandre Létourneau	8305978879	fixed ec2 get_console_output	2016-03-17 15:51:26 -04:00
rallytime	3934c66fce	Merge branch '2015.5' into '2015.8' ... No conflicts.	2016-03-17 12:32:42 -06:00
Nicole Thomas	fefb694104	Merge pull request #31947 from cro/bp-31601 ... Move proxymodule assignment earlier in proxy minion init	2016-03-17 12:14:23 -06:00
Nicole Thomas	a86490ee68	Merge pull request #31948 from rallytime/disable-pylint-error ... Revert "not not" deletion and add comment as to why that is there	2016-03-17 11:00:22 -06:00
Nicole Thomas	db3af864ae	Merge pull request #31952 from rallytime/lint-2015.8 ... Fix lint for 2015.8 branch	2016-03-17 10:59:49 -06:00
rallytime	3e964ec9d4	Fix lint for 2015.8 branch	2016-03-17 10:12:58 -06:00
C. R. Oldham	4eb193edb7	Lint, unrelated but fixed anyway.	2016-03-17 10:05:28 -06:00
C. R. Oldham	d661081016	Lint.	2016-03-17 10:03:38 -06:00
rallytime	86196cd59d	Revert "not not" deletion and add comment as to why that is there	2016-03-17 09:39:14 -06:00
C. R. Oldham	59e0a6f923	Dont add this file	2016-03-17 09:10:38 -06:00
C. R. Oldham	c68b968403	Old-style proxymodules need to be setup earlier in minion init. Also include more correct comments in config.py	2016-03-17 09:10:38 -06:00
Mike Place	2d1f2a0c2e	Merge pull request #31935 from twangboy/fix_build_script2 ... Back port nullsoft build script from 2015.8	2016-03-17 08:54:50 -06:00
Nicole Thomas	9ab4d6164b	Merge pull request #31933 from rallytime/fix-test-links ... Fix linking syntax in testing docs	2016-03-17 08:44:13 -06:00
twangboy	4af8c9dbfc	Back port nullsoft build script from 2015.8	2016-03-16 17:57:04 -06:00
rallytime	06dd2c0411	Fix linking syntax in testing docs	2016-03-16 16:43:53 -06:00
Mike Place	723d0ca19f	Merge pull request #31930 from cro/bp-31601 ... Backport changes from 2016.3	2016-03-16 16:12:28 -06:00
Mike Place	ce765ad2df	Merge pull request #31924 from jfindlay/2015.8 ... update 2015.8.8 release notes	2016-03-16 16:10:15 -06:00
C. R. Oldham	aa9a288b5a	Add these files back in	2016-03-16 15:23:55 -06:00
C. R. Oldham	916ef26957	Remove .orig file mistakenly added, reformat example.	2016-03-16 15:20:55 -06:00
C. R. Oldham	3c8185571d	Lint.	2016-03-16 15:19:43 -06:00
C. R. Oldham	9de9b9e86d	Missin import	2016-03-16 15:11:19 -06:00
C. R. Oldham	d571f3b8fe	Backport PR#31601	2016-03-16 15:09:54 -06:00
Nicole Thomas	390ef9fea7	Merge pull request #31922 from cachedout/issue_31890_1 ... For 2015.8 head	2016-03-16 13:07:11 -06:00
Justin Findlay	64dd8aebb2	update 2015.8.8 release notes	2016-03-16 11:49:01 -06:00
Mike Place	da075d9341	For 2015.8 head	2016-03-16 11:44:59 -06:00
Nicole Thomas	03e8b72655	Merge pull request #31904 from rallytime/merge-2015.8 ... [2015.8] Merge forward from 2015.5 to 2015.8	2016-03-16 11:23:54 -06:00
Mike Place	a4b3462346	Merge pull request #31906 from sbreidba/win_dacl_fixes ... Win_dacl module: fix FULLCONTROL / FILE_ALL_ACCESS definition	2016-03-16 09:20:19 -06:00
Mike Place	43240dc566	Merge pull request #31912 from jfindlay/log_mixin ... log.mixins: remove extermporaneous .record	2016-03-15 19:56:46 -06:00
Mike Place	b068eaa963	Merge pull request #31745 from isbm/isbm-always-minion-errcode-2-fix ... Fix the always-false behavior on checking state	2016-03-15 17:02:19 -06:00