rallytime cbf42a8407 Merge branch '2016.3' into 'develop' ... Conflicts: - conf/master - doc/ref/configuration/master.rst - salt/cli/batch.py - salt/cli/daemons.py - salt/config/__init__.py - salt/minion.py - salt/modules/aptpkg.py - salt/modules/beacons.py - salt/states/archive.py - salt/states/cmd.py - salt/utils/gitfs.py - tests/unit/states/cmd_test.py		2016-04-26 14:42:26 -06:00
..
integration	Merge branch '2016.3' into 'develop'	2016-04-26 14:42:26 -06:00
perf	Use print as a function [PEP 3105].	2015-12-04 16:17:35 -08:00
pkg/rpm	Updated salt.spec bash_completion	2016-04-07 09:16:47 -06:00
unit	Merge branch '2016.3' into 'develop'	2016-04-26 14:42:26 -06:00
utils	Merge branch '2016.3' into 'develop'	2016-04-01 10:33:44 -06:00
__init__.py
buildpackage.py	buildpackage.py: add salt.bash to SOURCES	2016-04-04 16:53:56 -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	Splay sleeps inside jenkins	2015-12-16 14:48:51 -07:00
minionswarm.py	Handle -c option in minionswarm script.	2016-03-21 16:13:43 +03: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	tests.runtests: make test suite args consistent (#32808)	2016-04-25 14:57:33 -06:00
salt-tcpdump.py	Pylint fixes	2016-03-15 14:55:35 -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