Colton Myers efb479a1bd Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop ... Conflicts: doc/topics/cloud/vmware.rst salt/cloud/clouds/vmware.py salt/grains/chronos.py salt/grains/marathon.py salt/loader.py salt/modules/chronos.py salt/modules/marathon.py salt/proxy/chronos.py salt/proxy/marathon.py salt/state.py salt/states/chronos_job.py salt/states/marathon_app.py salt/states/user.py salt/utils/schedule.py		2015-11-13 15:18:45 -07:00
..
integration	Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop	2015-11-13 15:18:45 -07: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.8' into merge-forward-develop	2015-11-13 15:18:45 -07:00
utils	Ignore PyLint for external ipaddress module	2015-04-15 15:47:36 +02:00
__init__.py
buildpackage.py	tests/buildpackage.py: remove raw string formatting	2015-08-26 23:26:07 -05: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	tests/jenkins.py: remove raw string formatting	2015-08-26 23:26:08 -05:00
minionswarm.py	Add rand-ver option	2015-09-23 16:09:23 -06:00
modparser.py	No empty docstrings	2015-07-12 19:26:33 +01:00
packdump.py	Py3 compatibility fixes.	2015-01-30 22:25:28 +00:00
runtests.py	Merge branch '2015.8' into 'develop'	2015-11-06 09:34:31 -07: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