Colton Myers 2c2a5f85ac Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/conf.py doc/topics/cloud/gce.rst salt/cli/api.py salt/cli/call.py salt/cli/cp.py salt/cli/key.py salt/cli/run.py salt/cli/salt.py salt/modules/dockerio.py salt/states/dockerio.py		2015-09-17 10:54:33 -06:00
..
integration	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-09-14 14:39:03 -06: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-09-17 10:54:33 -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
eventlisten.sh	Move giant eventlisten.sh example out of the state.event docstring	2015-09-10 13:38:09 -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	Fix permission on tests/runtests.py on 2015.5 branch	2015-08-12 13:04:17 -04: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