Colton Myers 0fc16040d6 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/topics/cloud/vmware.rst salt/cloud/__init__.py salt/cloud/clouds/vmware.py salt/loader.py salt/minion.py salt/modules/archive.py salt/modules/file.py salt/states/pkg.py salt/utils/http.py		2015-08-10 13:21:57 -06:00
..
integration	users: integration test for empty GECOS fields	2015-08-07 09:25:21 +02:00
perf	Simplify to just loop. No need for calibration since it doesn't max out.	2015-02-11 13:30:09 -07:00
pkg/rpm	Add unity manpage to buildpackage spec	2014-09-29 13:35:50 -05:00
unit	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-08-10 13:21:57 -06:00
utils	Ignore PyLint for external ipaddress module	2015-04-15 15:47:36 +02:00
__init__.py	Added utils dir and a helper for testing CherryPy apps	2014-03-29 23:20:29 -06:00
buildpackage.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00
committer_parser.py	lint	2015-03-10 15:37:49 -06:00
consist.py	Py3 compatibility fixes	2015-01-30 22:25:06 +00:00
eventlisten.py	Subscribe event to bus is optional now	2015-08-03 16:10:38 -06:00
jenkins.py	add tcp transport to jenkins and runtests	2015-07-20 16:56:00 -06:00
minionswarm.py	Fix bug preventing minionswarm from working with tcp transport	2015-04-30 12:49:16 -06:00
packdump.py	Py3 compatibility fixes.	2015-01-30 22:25:28 +00:00
runtests.py	add tcp transport to jenkins and runtests	2015-07-20 16:56:00 -06:00
salt-tcpdump.py	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-29 12:01:52 -06:00
saltsh.py	Py3 compatibility fixes	2015-01-30 22:25:08 +00:00
wheeltest.py	Add from __future__ import absolute_import	2015-01-30 22:25:04 +00:00