62442 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Mike Place	7e424e10f2	Merge pull request #28054 from dr4Ke/custom_grains_deep_merge ... loader uses a deep dictionary merge for the grains (core and customs)	2015-12-01 10:33:52 -07:00
Mike Place	f6d23d8aa2	Merge pull request #29245 from s0undt3ch/features/minion-engines ... Engines support on Minions!	2015-12-01 09:35:33 -07:00
Mike Place	7ec486655f	Merge pull request #29303 from cachedout/reorder_archive_extract_args ... Reorder arg to end	2015-12-01 09:16:59 -07:00
Mike Place	b95f5af2f2	Reorder arg to end. ... Refs #29292	2015-12-01 09:16:32 -07:00
Mike Place	bcc3438638	Merge pull request #29292 from magnusboman/archive_extract ... Add ability to extract archive if hash has changed	2015-12-01 09:12:51 -07:00
Magnus Boman	3b27f4e212	Fix indentation	2015-12-01 11:23:30 +11:00
Pedro Algarvio	33844c3cbd	Lower log levels	2015-12-01 00:16:44 +00:00
Pedro Algarvio	86e9fc9d29	Signal handling is done already in Minion	2015-12-01 00:12:54 +00:00
Magnus Boman	218b1fbb67	Add ability to extract archive if hash has changed	2015-12-01 11:10:35 +11:00
Mike Place	84c36ec92f	Merge pull request #29259 from Unity-Technologies/feature/beacon-adb ... Add beacon for android devices	2015-11-30 15:30:18 -07:00
Mike Place	4de97a681d	Merge pull request #29285 from cachedout/lint_29224 ... Implemented batch wait timer	2015-11-30 15:00:50 -07:00
Mike Place	5a3dce4376	Small grammar fix	2015-11-30 14:58:33 -07:00
Mike Place	7d276bdcd2	Merge pull request #29284 from cachedout/lint_29266 ... Add logentries engine	2015-11-30 14:48:32 -07:00
Mike Place	0d59fb3a99	Lint fixes	2015-11-30 14:46:49 -07:00
Mike Place	1e8fae820a	Merge pull request #29155 from shpsec-david/selinux-modules ... Adding basic control for selinux modules	2015-11-30 13:50:21 -07:00
Mike Place	117c48f6d4	Merge pull request #29276 from abednarik/prevent_adding_host_port_twice ... Prevent adding port twice when adding entry in known hosts	2015-11-30 13:49:06 -07:00
Mike Place	f3327c6e28	Merge pull request #29280 from cachedout/lint_29165 ... [Doc] Add note for SVN state	2015-11-30 13:44:52 -07:00
Mike Place	377a10bd14	Lint	2015-11-30 13:44:04 -07:00
Mike Place	aa741b7015	Merge pull request #29176 from woodrow/elb-backend-policy-management ... Allow boto_elb to manage ELB backend policies.	2015-11-30 13:36:44 -07:00
Mike Place	cc7fd252ad	Merge pull request #29211 from sjorge/module-zpool ... implement zpool.healthy and update zpool.list	2015-11-30 13:07:46 -07:00
Mike Place	50798d639e	Merge pull request #29226 from mephi42/develop ... fileclient: support @ sign in user names	2015-11-30 13:05:03 -07:00
Mike Place	f813508fae	Merge pull request #29237 from sjorge/module-network-fixes ... Module network fixes	2015-11-30 12:58:23 -07:00
Mike Place	5b82b31db5	Merge pull request #29225 from codehotter/fix-another-call-to-get-node ... Fix another call to _get_node	2015-11-30 12:53:31 -07:00
Daniel Hobley	34638a9b2d	Added version for adb becon	2015-11-30 20:32:47 +01:00
Daniel Hobley	24a3a98b3c	Removed global in favour of updating a dictionary	2015-11-30 20:29:53 +01:00
Justin Findlay	edd50a775a	Merge pull request #29220 from arthurlogilab/patch-14 ... typo in docstring	2015-11-30 12:22:13 -07:00
Daniel Hobley	2690e3c8f3	Replaced double quotes with single	2015-11-30 20:19:13 +01:00
Mike Place	a6889cbdcb	Merge pull request #29228 from s0undt3ch/develop ... Fix the `engines_dirs` config option name.	2015-11-30 12:15:25 -07:00
Stephen Woodrow	838b066667	Correctly implement test mode for listener and backend policies.	2015-11-30 11:03:34 -08:00
Mike Place	dd07533363	Merge pull request #29248 from sjorge/utils-seasoning ... sprinkle some salt.utils.* magic on salt.states.smartos and salt.modules.vmadm	2015-11-30 11:40:52 -07:00
abednarik	7f9e9756a4	Prevent adding port twice when adding entry in known hosts ... Check hostname value inside remote_host dictionary to find out ':'. In that case don't append port	2015-11-30 15:37:51 -03:00
Mike Place	c4cf25e033	Merge pull request #29242 from silenius/develop ... use salt.utils.is_freebsd()	2015-11-30 11:27:48 -07:00
Jimmy Tang	f8b6ec308e	Satisfy salt's python requirements	2015-11-30 16:38:20 +00:00
Jorge Schrauwen	cbded94f1a	fix unit test (attempt 1)	2015-11-30 16:21:49 +00:00
Jorge Schrauwen	cd1582214d	changed from Boron to 2015.8.4, so this can be backported	2015-11-30 15:41:05 +00:00
Jorge Schrauwen	99dc99825c	fix up a few remarks from jfindlay	2015-11-30 15:37:59 +00:00
Jimmy Tang	bdda03c456	Add logentries engine ... This engine is first attempt at a simple engine to send event information to the Logentries logging service.	2015-11-30 13:58:10 +00:00
Daniel Hobley	66ee07c2fa	Lint fixes	2015-11-30 11:12:55 +01:00
Joseph Hall	8f54eeae8c	Merge pull request #29257 from nmadhok/develop-vmware-driver ... VMware cloud driver refactors and doc fixes	2015-11-29 17:48:32 -07:00
Nitin Madhok	1715342795	Remove useless whitespaces	2015-11-29 18:30:55 -05:00
Nitin Madhok	e30587d054	Updating docs for VMware cloud driver	2015-11-29 18:28:45 -05:00
Nitin Madhok	4fc2986b16	Updating docs for VMware cloud driver	2015-11-29 18:24:09 -05:00
Nitin Madhok	de930de77f	Fixing issues with VMware cloud driver	2015-11-29 18:21:05 -05:00
Nitin Madhok	248c090af2	Updating/reorganizing docs for VMware cloud driver	2015-11-29 18:20:26 -05:00
Jorge Schrauwen	600e0fc543	ofcourse also cleanup the unneeded code	2015-11-27 20:02:59 +00:00
Jorge Schrauwen	90c03d28b6	sprinkle some salt.utils.clean_kwargs onto salt.module.vmadm	2015-11-27 20:01:55 +00:00
Jorge Schrauwen	5f5926c9c3	spring the lovely atomic_open on salt.states.smartos	2015-11-27 19:41:39 +00:00
Pedro Algarvio	34f334de6b	Engines support on Minions!	2015-11-27 14:10:12 +00:00
Daniel Hobley	f482643959	Added beacon for detecting low battery on android devices	2015-11-27 14:03:05 +01:00
Julien Cigar	6b6a17c76b	use salt.utils.is_freebsd()	2015-11-27 12:55:31 +01:00