27628 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas S Hatch	413d1bc4b1	modularize the ckminions system for raetkey	2014-03-13 11:18:41 -06:00
Thomas S Hatch	8a707dc0d3	modularize the key outputter	2014-03-13 10:39:29 -06:00
Thomas S Hatch	a392c2af23	Merge pull request #11206 from pass-by-value/halite_doc_modification ... Remove doc reference to root user	2014-03-13 10:34:39 -06:00
Aditya Kulkarni	2541f45aca	Remove doc reference to root user	2014-03-13 12:24:24 -04:00
Thomas S Hatch	d1bb711860	Merge pull request #11201 from galet/ini-missing-rows ... ini_manage module: Preserve empty lines between options and comments.	2014-03-13 10:15:01 -06:00
Thomas S Hatch	8f93e0fcbb	Merge pull request #11197 from mtorromeo/fix/cloudlinux ... Fix incorrect detection of a cloudlinux kernel as an openvzve	2014-03-13 10:14:00 -06:00
Thomas S Hatch	d8984ce236	Merge pull request #11195 from mtorromeo/fix/package-templates ... Fix template packaging issue	2014-03-13 10:09:10 -06:00
Thomas S Hatch	cfa33c3f56	fix indentation errors	2014-03-13 10:07:51 -06:00
Thomas S Hatch	71f2f36d4e	Merge pull request #11180 from CaptTofu/develop ... HP Is using Havana (vs. Grizzly)	2014-03-13 10:04:11 -06:00
Pedro Algarvio	cb5c2dd5f7	Merge pull request #11194 from makinacorpus/hotfix2 ... Yet another fix for ImmutableProxyList	2014-03-13 16:03:12 +00:00
Thomas S Hatch	df3622d4c0	Merge pull request #11193 from avdhoot/develop ... Fix #11173 1st chnage :passed saltenv as kwargs in kg state. 2nd chnage:...	2014-03-13 10:01:24 -06:00
Joseph Hall	ce2b434b02	Merge pull request #11200 from techhat/parted ... Make fs_type not required in partition.mkpart	2014-03-13 09:45:52 -06:00
Joseph Hall	c417dad1e7	Make fs_type not required	2014-03-13 06:51:59 -06:00
Joseph Hall	95855a0abf	Merge pull request #11168 from dmyerscough/develop ... mkpart should only create partitions and mkpartfs should support xfs	2014-03-13 06:42:58 -06:00
Michal Galet	a50ee98e9b	Cosmetic: Fix missing newline at the end of file.	2014-03-13 13:32:52 +01:00
Michal Galet	9093cf0364	ini_manage module: Preserve empty lines between options and comments.	2014-03-13 12:46:17 +01:00
Massimiliano Torromeo	9b9144d966	Check /proc/vz/veinfo presence to distinguish between a real openvz virtual environment and a cloudlinux kernel	2014-03-13 11:37:51 +01:00
Massimiliano Torromeo	e1fbcb8ce1	Fix template packaging issue	2014-03-13 11:24:30 +01:00
Mathieu Le Marec - Pasquet	ab0b465d3e	Yet another fix for ImmutableProxyList ... This is related to #11088, #11035, #11003, #11190.	2014-03-13 10:53:55 +01:00
Avdhoot	ba6d4f9ec1	Fix #11173 1st chnage :passed saltenv as kwargs in kg state. 2nd chnage: added apt.Cache() in aptpkg module	2014-03-13 13:11:06 +05:30
Thomas S Hatch	7b0338279b	Make the salt-key cli system modular for raet keys	2014-03-13 00:31:21 -06:00
Thomas S Hatch	95c9a113ec	Use the salt specific udp behavior	2014-03-13 00:06:50 -06:00
Thomas S Hatch	5db27d0e8e	Extend verify_env to cover raet key dirs if raet is enabled	2014-03-13 00:00:03 -06:00
Thomas S Hatch	8a52f87fcd	Revert "Reuse Channels" ... This reverts commit ae9b62c27f.	2014-03-12 23:50:36 -06:00
Thomas S Hatch	ecdd43fe85	track on estate name, not estate object	2014-03-12 23:46:50 -06:00
Thomas S Hatch	e9d05b7b1b	Correctly re-routepublish results from the local cmds	2014-03-12 23:38:15 -06:00
Damian Myerscough	61e7df8b43	Just add xfs supported filesystem	2014-03-12 22:19:12 -07:00
Thomas S Hatch	2c7cbbc0c3	get is a function!	2014-03-12 23:12:59 -06:00
Damian Myerscough	bceeadddf4	Merge remote-tracking branch 'upstream/develop' into develop	2014-03-12 22:06:17 -07:00
Thomas S Hatch	6a9d237446	kill spurious print	2014-03-12 23:04:31 -06:00
Thomas S Hatch	18cbc7e0ff	Add a safe	2014-03-12 22:49:57 -06:00
Thomas S Hatch	334a79ea6d	msgpack for events	2014-03-12 22:42:21 -06:00
Thomas S Hatch	8fbdaef28e	Set everythign to use msgpack	2014-03-12 22:18:36 -06:00
Thomas S Hatch	ec401a8b1f	Add salt specific udp stack behavior	2014-03-12 22:18:36 -06:00
Thomas S Hatch	2a79b489fe	Register workers with the router	2014-03-12 22:18:36 -06:00
Thomas S Hatch	fa72900d86	Merge pull request #10332 from jacksontj/channelreuse ... Reuse Channels	2014-03-12 21:38:50 -06:00
Pedro Algarvio	bd2b5eb502	Merge pull request #11191 from s0undt3ch/develop ... Revert "Revert "Fix #11003 TypeError: can only concatenate list (not "Im...	2014-03-13 01:22:26 +00:00
Pedro Algarvio	4e86550069	Revert "Revert "Fix #11003 TypeError: can only concatenate list (not "ImmutableLazyProxy(list)") to list"" ... This reverts commit 58ac70b85f.	2014-03-13 01:21:04 +00:00
David Boucha	86bbb0a382	Merge pull request #11187 from terminalmage/issue10541 ... Fix regression in chocolatey.bootstrap	2014-03-12 17:44:20 -06:00
Samuel Smith	e1ba5ae01d	Merge pull request #11188 from SmithSamuelM/sam_raet_21 ... Sam raet 21 Added preliminary support for salt.key.RaetKey in Udp Stack	2014-03-12 17:00:38 -06:00
Samuel M Smith	d6c833d5af	Merge remote-tracking branch 'upstream/develop' into sam_raet_21	2014-03-12 16:55:31 -06:00
Samuel M Smith	fc6cb4de2e	Added support for the salt.key.RaetKey in Raet Udp stack	2014-03-12 16:53:16 -06:00
Thomas S Hatch	ed7b3a2713	avoid stack trace with explicit yard name	2014-03-12 16:50:50 -06:00
Erik Johnson	e2b3e93071	Fix regression in chocolatey.bootstrap	2014-03-12 17:50:04 -05:00
Thomas S Hatch	5dc8be72b9	Merge pull request #11186 from cachedout/11185 ... Link directly to bootstrap README.	2014-03-12 16:27:58 -06:00
Thomas S Hatch	073b1d9a9c	switch to local client factory function	2014-03-12 16:26:30 -06:00
Mike Place	ec7dec55f7	Link directly to bootstrap README.	2014-03-12 16:04:45 -06:00
Thomas S Hatch	f7cd160e9f	Merge pull request #11184 from cachedout/11094 ... Fix localclient	2014-03-12 15:52:07 -06:00
Thomas S Hatch	51e4449c57	Merge pull request #11182 from terminalmage/state-single-mod-init ... Call mod_init when invoking state.single	2014-03-12 15:51:46 -06:00
Thomas S Hatch	3ccff2cfbf	Pull depreaction warning until it is cleaned up ... Once the deprecated modules are cleaned up we can uncomment this	2014-03-12 15:49:50 -06:00