16 Commits

Author	SHA1	Message	Date
Colton Myers	cca8ddc886	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: .pylintrc .testing.pylintrc salt/auth/pam.py salt/modules/win_status.py salt/utils/network.py salt/utils/schedule.py tests/unit/renderers/gpg_test.py tests/unit/states/boto_secgroup.py	2015-04-29 12:01:52 -06:00
Pedro Algarvio	a96fb2ae73	Add required white-space	2015-04-27 09:11:29 +01:00
Pedro Algarvio	70810daba2	Some minimum-python-version PyLint disables	2015-04-26 10:57:59 +01:00
rallytime	3cc8788f7b	Pylint fix for develop	2015-04-14 15:54:38 -06:00
Mike Place	c324e568aa	Fix broken salt-tcpdump	2015-04-14 13:35:16 -06:00
Pedro Algarvio	7791067379	Lint fix	2015-01-30 22:25:32 +00:00
Pedro Algarvio	1bcda11f3d	Py3 compatibility fixes.	2015-01-30 22:25:28 +00:00
Pedro Algarvio	60f215f191	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
Nitin Madhok	c992f04f32	Changing permissions of test files and fixing lint violations	2014-12-19 05:50:18 -05:00
vs	d1599b4780	more linting	2014-08-16 09:24:46 +02:00
vs	bae8d39bb1	lint fixes	2014-08-16 09:01:16 +02:00
vs	12bc275388	fix mail address	2014-08-15 13:17:19 +02:00
vs	c26e50e694	more linting	2014-08-15 13:05:42 +02:00
vs	b175b705ce	pylinting and cleanup	2014-08-15 13:03:26 +02:00
vs	11f544b3ba	fix missing brace	2014-08-15 12:15:49 +02:00
vs	0ad1f016ed	add tcp-dumper for visualzing salt-master network activity	2014-08-15 12:11:50 +02:00