44738 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
rallytime	dc23823897	Merge branch '2014.7' into '2015.2' ... Conflicts: salt/modules/localemod.py	2015-01-27 13:24:14 -07:00
Thomas S Hatch	5422eae6cf	journald beacon is almost there, just need to clean up the ... data types from the journald reader	2015-01-27 13:19:05 -07:00
Thomas S Hatch	cc1e81ac1a	Merge pull request #20112 from rallytime/pylint_7 ... Pylint fixes for 2014.7 branch	2015-01-27 11:18:36 -07:00
rallytime	2a5396ca81	Pylint fixes for 2014.7 branch	2015-01-27 11:17:17 -07:00
Thomas S Hatch	d54f3b5680	Merge pull request #20111 from Trax-air/fix-ssh-port ... ssh_port should be an int in deploy_kwargs.	2015-01-27 11:11:56 -07:00
Thomas S Hatch	291073cf22	Merge pull request #20110 from rallytime/pylint_15 ... Fix pylint on 2015.2 branch	2015-01-27 11:10:22 -07:00
Thomas S Hatch	3e6ade38bd	wtmp beacon final fixes	2015-01-27 10:55:59 -07:00
Flavian	f3daf2c780	Ssh_port should be an int in deploy_kwargs. ... Also contesting for the shortest pull request ever.	2015-01-27 18:41:36 +01:00
rallytime	4d0e6ec05d	Fix pylint on 2015.2 branch	2015-01-27 10:34:43 -07:00
Thomas S Hatch	873fde30c4	Merge pull request #20097 from jfindlay/fix_locale_gen ... fix debian/ubuntu handling in locale.gen_locale	2015-01-27 10:15:12 -07:00
Thomas S Hatch	5867959cf4	Merge pull request #20088 from basepi/merge-forward-2015.2 ... Merge forward from 2014.7 to 2015.2	2015-01-27 10:04:39 -07:00
Thomas S Hatch	b3ae619fe1	Merge pull request #20079 from kim0/freebsd-status.version-2014.7 ... Implement Freebsd status.version merge to 2014.7	2015-01-27 10:03:56 -07:00
Thomas S Hatch	c56654510e	Merge pull request #20072 from techhat/joyenthttp ... Switch Joyent to salt.utils.http.query()	2015-01-27 09:58:05 -07:00
Thomas S Hatch	21fc5049ed	Merge pull request #20070 from techhat/pagerdutyhttp ... Switch PagerDuty to salt.utils.http.query()	2015-01-27 09:56:55 -07:00
Thomas S Hatch	d1d5676999	Merge pull request #20069 from techhat/httputils ... Fixup header handling in http.query()	2015-01-27 09:56:45 -07:00
Thomas S Hatch	86a6c80268	initial wtmp beacon for login monitoring	2015-01-27 00:06:27 -07:00
Justin Findlay	4be92ed200	fix debian/ubuntu handling in locale.gen_locale ... fixes #18936; also handle user input gracefully in locale.avail	2015-01-26 23:13:55 -07:00
Thomas S Hatch	750676fb7a	Start on a simple journald beacon	2015-01-26 23:11:23 -07:00
Thomas S Hatch	d0bf8429dc	Merge pull request #20080 from kim0/freebsd-status.nproc-2014.7 ... Implement Freebsd status.nproc merge to 2014.7	2015-01-26 20:39:21 -07:00
Thomas S Hatch	d199edde20	Merge pull request #20076 from rallytime/fix_states_file_tests ... Add some mocked variables to fix the file_test failures	2015-01-26 20:38:53 -07:00
Thomas S Hatch	9ce1155b45	Merge pull request #20071 from techhat/githubhttp ... Switch GitHub to salt.utils.http.query()	2015-01-26 20:37:30 -07:00
Thomas S Hatch	11a1506f12	Merge pull request #20089 from lyft/lyft-boto-dynamodb-2015.2 ... add boto dynamodb salt module and state	2015-01-26 20:34:16 -07:00
Thomas S Hatch	c86aa162ac	Merge pull request #20092 from thatch45/beacons ... Beacons!!!!	2015-01-26 20:33:54 -07:00
Thomas S Hatch	934fb002f4	Merge pull request #6 from rallytime/beacons ... Add beacons section to 2015.2.0 release notes	2015-01-26 20:32:46 -07:00
rallytime	80bfa4a2a6	Add beacons section to 2015.2.0 release notes	2015-01-26 20:26:51 -07:00
Nicole Thomas	9d82d0f9a7	Merge pull request #20091 from rallytime/fix_cloud_tests ... Change image name in rackspace profile config to a valid one	2015-01-26 20:04:52 -07:00
Mike Demmitt	51407036d9	fixing lint errors	2015-01-26 17:43:58 -08:00
Thomas S Hatch	e003927423	Merge pull request #5 from whiteinge/beacons-doc ... Added beacon docs	2015-01-26 18:40:20 -07:00
Seth House	8e476bc455	Fixed typos in the beacon docs	2015-01-26 18:20:54 -07:00
Seth House	2f7376ad6b	Added __virtual__ and __virtualname__ to inotify beacon module	2015-01-26 18:19:34 -07:00
Seth House	b777d3cba1	Added unique identifier for the beacon docs	2015-01-26 18:19:34 -07:00
Seth House	a26aef0d7d	Added beacon module docs to the module index	2015-01-26 18:19:34 -07:00
Seth House	127ddb6d9c	Added cross-references to the inotify beacon module	2015-01-26 18:19:34 -07:00
Thomas S Hatch	185856ddbb	don't fire master events if the queue is empty!	2015-01-26 17:31:48 -07:00
Thomas S Hatch	1421ed22d8	need to have a frame to start things later on	2015-01-26 17:19:46 -07:00
Thomas S Hatch	9ec62ad249	handle typos	2015-01-26 17:12:01 -07:00
Ahmed Kamal	34452f1d27	enchant pylint with spaces after commas	2015-01-27 01:59:35 +02:00
Thomas S Hatch	5affea1022	Merge branch '2015.2' into beacons	2015-01-26 16:57:43 -07:00
Ahmed Kamal	12222004ec	KISS, get nproc value from grains	2015-01-27 01:52:07 +02:00
Mike Demmitt	6b04c3d67a	add boto dynamodb salt module and state	2015-01-26 15:12:35 -08:00
Colton Myers	ce9d2cb6cb	Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 ... Conflicts: .pylintrc .testing.pylintrc salt/states/file.py salt/utils/__init__.py	2015-01-26 15:53:05 -07:00
Thomas S Hatch	70b9370a96	Merge pull request #20087 from shanedlee/fix_docs_2 ... Changed exe's to installers	2015-01-26 15:52:01 -07:00
Shane D Lee	7c253f5ede	Changed exe's to installers	2015-01-26 15:48:03 -07:00
Thomas S Hatch	efa3bd615a	Merge pull request #20048 from s0undt3ch/features/use-saltpylint ... Make use of the SaltPyLint package separated from SaltTesting	2015-01-26 15:37:09 -07:00
Thomas S Hatch	f254f1fb10	Merge pull request #20041 from rallytime/fix_dulwich_check ... dulwich.__version__ returns a tuple of ints instead of a string	2015-01-26 15:27:42 -07:00
Colton Myers	1371f4be6f	Merge pull request #20084 from basepi/outputtererror20077 ... Default to nested for outputter of '' [2015.2]	2015-01-26 15:26:37 -07:00
Thomas S Hatch	11ae0173a9	Merge pull request #20057 from basepi/merge-forward-2015.2 ... Merge forward from 2014.7 to 2015.2	2015-01-26 15:26:23 -07:00
Thomas S Hatch	074c408a51	Add __instance_id__ to pylint checks as this has been added to ... the active state runs for state run tracking	2015-01-26 15:22:18 -07:00
Colton Myers	da6d25e13c	Default to nested for outputter of '' ... Fixes #20077	2015-01-26 15:15:20 -07:00
Colton Myers	fec063a968	Finish out the matcher_args ... Appears that someone started adding matcher_args to help with the addition of the delimiter arg, but forgot to finish it. Fixes #20074	2015-01-26 14:23:29 -07:00