46308 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Thomas S Hatch	bb58c37c58	Merge pull request #20333 from errge/patch-1 ... Fix ambiguity and typo in test.fib documentation	2015-02-03 06:20:31 -07:00
Thomas S Hatch	e742d995ea	Merge pull request #20332 from westurner/patch-2 ... DOC: topics/tutorials/walkthrough.rst: then > than	2015-02-03 06:20:10 -07:00
Thomas S Hatch	20bbd01bc8	Merge pull request #20331 from jayeshka/etcd_mod-unit-test ... adding etcd_mod unit test case	2015-02-03 06:19:43 -07:00
Thomas S Hatch	46b3a24947	Merge pull request #20330 from jayeshka/memcached-unit-test ... adding memcached unit test case	2015-02-03 06:19:33 -07:00
Thomas S Hatch	9fe7c36964	Merge pull request #20327 from jayeshka/ldapmod-unit-test ... adding ldapmod unit test case	2015-02-03 06:18:40 -07:00
Thomas S Hatch	3e6370c6e5	Merge pull request #20326 from jayeshka/munin-unit-test ... adding munin unit test	2015-02-03 06:18:20 -07:00
Thomas S Hatch	0aed9b3704	Merge pull request #20325 from jayeshka/moosefs-unit-test ... adding moosefs unit test	2015-02-03 06:17:27 -07:00
Thomas S Hatch	06d314b8bc	Merge pull request #20324 from jayeshka/logrotate-unit-test ... adding logrotate unit test	2015-02-03 06:17:08 -07:00
Thomas S Hatch	885702680f	Merge pull request #20323 from atbell/GH-20322_fix_cert_creation_in_tls_module ... Fixes #20322, check for existing cert, return CN (not ca_name)	2015-02-03 06:16:58 -07:00
Thomas S Hatch	78a613a3a6	Merge pull request #20321 from jayeshka/keyboard-unit-test ... adding keyboard unit test case	2015-02-03 06:13:56 -07:00
Thomas S Hatch	82d6677e12	Merge pull request #20294 from jayeshka/introspect-unit-test ... adding introspect unit test case	2015-02-03 06:12:38 -07:00
Thomas S Hatch	ff1312e1db	Merge pull request #20320 from jayeshka/locate-unit-test ... adding locate unit test case	2015-02-03 06:11:28 -07:00
Thomas S Hatch	4487925c05	Merge pull request #20319 from jayeshka/iptables-unit-test ... adding iptables unit test case	2015-02-03 06:10:55 -07:00
Thomas S Hatch	1ca78130c7	Merge pull request #20315 from jodv/fix-syndic-user-passing ... fix syndic getting user from kwarg	2015-02-03 05:59:51 -07:00
Thomas S Hatch	c192b365f5	Merge pull request #20313 from basepi/merge-forward-develop ... Merge forward from 2015.2 to develop	2015-02-03 05:55:49 -07:00
Thomas S Hatch	e26a29e447	Merge pull request #20302 from theonlypippo/patch-1 ... add 'ipv6-localhost/loopback' to punish list	2015-02-03 05:55:05 -07:00
Thomas S Hatch	1bf40679a5	Merge pull request #20292 from flugel-it/develop ... Documentation: How to store Minion config options on Pillars.	2015-02-03 05:53:23 -07:00
Thomas S Hatch	e6af13d973	Merge pull request #20286 from garethgreenaway/debian_source_interface ... Changes to debian_ip.py	2015-02-03 05:51:16 -07:00
Gergely Risko	5130c31b64	Fix ambiguity and typo in test.fib documentation	2015-02-03 13:04:47 +01:00
Wes Turner	203f5c3798	DOC: topics/tutorials/walkthrough.rst: then > than	2015-02-03 05:42:50 -06:00
Jayesh Kariya	d91b36a8fc	adding etcd_mod unit test case	2015-02-03 16:59:26 +05:30
Jayesh Kariya	697099c469	adding memcached unit test case	2015-02-03 16:57:53 +05:30
Jayesh Kariya	f9d43f5adc	resolved pylint errors	2015-02-03 14:41:32 +05:30
Jayesh Kariya	b1bf62ae74	adding ldapmod unit test case	2015-02-03 14:18:42 +05:30
Jayesh Kariya	8745225574	adding munin unit test	2015-02-03 14:17:14 +05:30
Jayesh Kariya	24c9004023	adding moosefs unit test	2015-02-03 14:00:22 +05:30
Jayesh Kariya	ec88812ed9	adding logrotate unit test	2015-02-03 13:59:01 +05:30
Aaron Bell	8e0bd5ac9e	Fixes #20322, check for existing cert, return CN (not ca_name)	2015-02-03 00:15:23 -08:00
Jayesh Kariya	d1b4fce53e	removed pylint error	2015-02-03 13:34:01 +05:30
Thomas S Hatch	3ecaee37c5	Merge pull request #20311 from jacksontj/develop ... Switch to compiled regex's	2015-02-03 00:13:09 -07:00
Jayesh Kariya	3ad563df91	adding locate unit test case	2015-02-03 12:06:11 +05:30
Jayesh Kariya	9d2dd056a6	adding keyboard unit test case	2015-02-03 12:04:47 +05:30
Jayesh Kariya	1ae01547e3	adding iptables unit test case	2015-02-03 12:02:56 +05:30
Jeremy Rosenbaum	2caf78021d	fix syndic getting user from kwarg	2015-02-02 16:17:17 -08:00
Colton Myers	068a23e390	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: salt/daemons/flo/core.py salt/fileclient.py salt/utils/cloud.py salt/utils/schedule.py	2015-02-02 15:27:43 -07:00
Thomas Jackson	48637b8267	Switch to compiled regex's ... Performance!!	2015-02-02 14:01:31 -08:00
Thomas S Hatch	d1c0e067e5	Merge pull request #20310 from jacksontj/develop ... Typo fix	2015-02-02 14:47:53 -07:00
Thomas Jackson	77ea42e549	Typo fix	2015-02-02 13:41:33 -08:00
Gareth J. Greenaway	edcb4cf4fe	Fixing pylint error	2015-02-02 12:34:33 -08:00
Nicole Thomas	4b94cfb4dc	Merge pull request #20269 from rallytime/refactor_localemod_tests ... Fix broken localemod_test on develop	2015-02-02 12:56:56 -07:00
theonlypippo	7d6b8565b2	add 'ipv6-localhost/loopback' to punish list ... reported in https://github.com/saltstack/salt/issues/20299	2015-02-02 14:00:37 -05:00
rallytime	a99b030e36	Mock salt.utils.which call	2015-02-02 11:55:11 -07:00
Seth House	ef0b32cb1a	Merge pull request #20283 from CameronNemo/CameronNemo-patch-1 ... Add Upstart job for salt-api	2015-02-02 11:41:36 -07:00
Jayesh Kariya	f021c43e97	adding introspect unit test case	2015-02-02 19:17:24 +05:30
Diego Woitasen	e6f64019a8	How to store Minion config options on Pillars.	2015-02-02 09:27:13 -03:00
Diego Woitasen	11bf6dd734	Merge branch 'develop' of https://github.com/saltstack/salt into develop	2015-02-02 09:12:15 -03:00
Thomas S Hatch	971cfb36a3	Merge pull request #20291 from thatch45/react_fixes ... Add id to beacon return data	2015-02-02 03:43:37 -07:00
Thomas S Hatch	eec9ac98e4	lint	2015-02-02 03:42:54 -07:00
Thomas S Hatch	eaff795bdd	Add id tot he beacon event dataset	2015-02-02 03:29:54 -07:00
Thomas S Hatch	9b9861076d	Add exc_info to the reactor error log	2015-02-02 03:27:15 -07:00