Colton Myers 76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: doc/topics/cloud/vmware.rst salt/cloud/clouds/digital_ocean_v2.py salt/cloud/clouds/vmware.py salt/daemons/flo/core.py salt/modules/hipchat.py salt/modules/lxc.py salt/modules/rabbitmq.py salt/pillar/s3.py salt/states/dockerio.py salt/states/file.py salt/utils/process.py salt/utils/s3.py		2015-07-20 13:55:14 -06:00
..
integration	Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8	2015-07-20 13:55:14 -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-07-20 13:55:14 -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	Remove old commented out listen definition and make parser arguments PEP8 compliant	2015-06-22 21:14:56 -07:00
jenkins.py	Manual merge of #24414 per thatch45	2015-06-06 07:47:52 -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	Added power cfg module and state for windows minions	2015-05-12 14:49:48 +02: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