33806 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Samuel Smith	b5172ed0ac	Merge pull request #14104 from SmithSamuelM/sam_raet_50 ... Fixed regression that messed up Road Keep data directory	2014-07-10 13:24:15 -06:00
Samuel M Smith	408a8185ab	Fixed regression that messed up Road Keep data directory ... Added jobber stack in prep for refactor of jobber channel	2014-07-10 13:23:08 -06:00
Pedro Algarvio	92331d86b5	Merge pull request #14098 from cachedout/trace_decorator_log ... Debug log level makes the test logs unusable.	2014-07-10 19:32:36 +01:00
Mike Place	5fb3004a27	Debug log level makes the test logs unusable. ... These need to be at trace	2014-07-10 11:41:45 -06:00
Thomas S Hatch	126462c0e5	Start on Helium release notes	2014-07-10 11:21:06 -06:00
Thomas S Hatch	165780ce85	Merge pull request #14096 from cachedout/raet_pillar_fix ... Pillar fix in raet	2014-07-10 11:01:53 -06:00
Mike Place	93380d9ce0	Pillar fix in raet	2014-07-10 10:59:33 -06:00
Thomas S Hatch	537bf055e0	lint	2014-07-10 10:56:12 -06:00
Thomas S Hatch	df5a00066f	this is a little more complicated, I am moving it back for now	2014-07-10 10:46:41 -06:00
Thomas S Hatch	618646f281	ensure that minions can't spoof local_cmd and locals can't ... spoof remote cmds	2014-07-10 10:42:16 -06:00
Thomas S Hatch	17df87057c	Merge pull request #14090 from YanChii/solaris-smf-available ... Use svcs for service.available in Solaris.	2014-07-10 10:28:42 -06:00
Thomas S Hatch	9bcadf3c9a	Merge pull request #14033 from ihrwein/add-syslog-ng-module ... Add syslog-ng state and execution module	2014-07-10 10:09:37 -06:00
Thomas S Hatch	5086120ea2	Merge pull request #14052 from pengyao/pip_state ... Add pip install check for requirements	2014-07-10 10:08:26 -06:00
Samuel Smith	f13b3e21fd	Merge pull request #14095 from SmithSamuelM/sam_raet_50 ... Changed raet channel to be one and done on creating and closing the yard	2014-07-10 10:07:24 -06:00
Samuel M Smith	b06aeec003	Changed raet channel to be one and done on creating and closing the yard ... Removed spurious yard from nix executor	2014-07-10 10:06:21 -06:00
Thomas S Hatch	af5f42a370	Merge pull request #14069 from rallytime/batch_test ... Simple integration test for batch cli command	2014-07-10 10:06:19 -06:00
Joseph Hall	25590886e7	Merge pull request #14091 from mgwilliams/lxc ... modules.lxc: fix bug in lxc.create; use config.get instead of config.option	2014-07-10 09:44:04 -06:00
Matthew Williams	34bc4bcd79	modules.lxc: use config.get instead of config.option	2014-07-10 11:13:09 -04:00
Matthew Williams	ee5c9c73ba	modules.lxc: fix bug in lxc.create	2014-07-10 11:09:19 -04:00
YanChii	c584fbcc35	Use svcs for service.available in Solaris. Allows use of partial FMRI ... match. Addition to #13983.	2014-07-10 14:01:22 +02:00
rallytime	0000859eb1	pylint fix	2014-07-09 22:31:54 -06:00
rallytime	9eae34c935	Merge branch 'batch_test' of https://github.com/rallytime/salt into batch_test	2014-07-09 22:01:21 -06:00
rallytime	1acf3ac3a9	Fix batch test	2014-07-09 22:00:41 -06:00
Thomas S Hatch	779aa72367	Merge pull request #14070 from nshalman/requirements ... SmartOS esky build: requirements files	2014-07-09 21:23:23 -06:00
Thomas S Hatch	e3a98c1c21	Merge pull request #14082 from whiteinge/full-cors ... Added support for the full CORS preflight request	2014-07-09 21:21:19 -06:00
Thomas S Hatch	5008d8d750	Merge pull request #14077 from jacksontj/pubfilter ... Change the defaults to be backwards compatible (fix #13285)	2014-07-09 21:20:27 -06:00
Thomas S Hatch	ca2b6ac636	Merge pull request #14068 from nmadhok/fix-file-makedirs-function ... Adding a trailing slash after path if not present when using salt.modules.file.makedirs	2014-07-09 21:19:38 -06:00
pengyao	bfa756cc9e	Set default value for pip_install_call.get('stdout')	2014-07-10 11:19:33 +08:00
Thomas S Hatch	84c5bff537	Merge pull request #14067 from garethgreenaway/network_connect ... Adding a function to test connections to UDP and TCP ports from minion.	2014-07-09 21:18:34 -06:00
Seth House	d1554a168e	Added support for the full CORS preflight request	2014-07-09 19:41:09 -07:00
Nicole Thomas	b77491b2db	Merge pull request #4 from s0undt3ch/hotfix/rally-cli-tests ... Fix `dest` value	2014-07-09 19:12:07 -06:00
Joseph Hall	94a2d57dd8	Merge pull request #14078 from s0undt3ch/hotfix/lint ... Lint Fixes	2014-07-09 17:41:39 -06:00
Pedro Algarvio	77aeefe261	Fix dest value	2014-07-10 00:41:26 +01:00
Pedro Algarvio	3b3be82014	Remove duplicate method	2014-07-10 00:31:14 +01:00
Pedro Algarvio	e02be6c8d2	White space lint fixes	2014-07-10 00:30:49 +01:00
Pedro Algarvio	04f0052100	Not renaming, so, return True.	2014-07-10 00:25:56 +01:00
Pedro Algarvio	21522a9824	White space lint fixes. Join imports.	2014-07-10 00:25:13 +01:00
Pedro Algarvio	9afe98614f	White space lint fixes	2014-07-10 00:23:54 +01:00
Pedro Algarvio	29fae98470	Merge pull request #14072 from terminalmage/refine-gitfs-tests ... Refine gitfs tests	2014-07-10 00:02:28 +01:00
Thomas Jackson	23f77ce363	Change the defaults to be backwards compatible (fix #13285)	2014-07-09 16:01:43 -07:00
C. R. Oldham	a814de3e43	Merge pull request #14076 from cro/macportsfile ... Portfile and .plist files for MacPorts	2014-07-09 16:49:06 -06:00
C. R. Oldham	46fdc9b5dd	Portfile and .plist files for MacPorts	2014-07-09 16:46:02 -06:00
Gareth J. Greenaway	f5071774bb	move arguments into kwargs. add ability to force family to be either ipv4 or ipv6, otherwise if a host is specified then we leave it up to the resolver.	2014-07-09 15:27:46 -07:00
Thomas S Hatch	02b2acdbc0	Tom can't spell very well, new news	2014-07-09 16:24:40 -06:00
rallytime	1df0c20d97	Pyling fixes	2014-07-09 16:22:00 -06:00
C. R. Oldham	5cac9152c9	merge commit	2014-07-09 16:19:14 -06:00
C. R. Oldham	fb0bc9a044	Merge pull request #14073 from cro/master_tops_docs ... Master tops docs	2014-07-09 16:17:44 -06:00
Colton Myers	eea5e357fd	Add 2014.1.7 release notes	2014-07-09 16:12:06 -06:00
C. R. Oldham	426e958296	merge commit	2014-07-09 16:10:44 -06:00
Colton Myers	3ec4d92576	Add 2014.1.7 release notes	2014-07-09 16:08:25 -06:00