rallytime 031a75ca33 Merge branch '2015.8' into '2016.3' ... Conflicts: - Contributing.rst - conf/master - doc/index.rst - doc/man/salt.7 - pkg/suse/README.suse - salt/client/ssh/state.py - salt/minion.py - salt/modules/zypper.py - salt/utils/schedule.py - tests/unit/modules/zypper_test.py		2016-03-02 10:26:13 -07:00
..
buildenv	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
installer	Remove trailing white spaces in files under pkg/ dir	2016-03-01 17:37:18 +02:00
modules	Move build files to salt/pkg/windows	2016-02-12 21:00:30 -07:00
build_env.ps1	Move build files to salt/pkg/windows	2016-02-12 21:00:30 -07:00
build_pkg.bat	Move build files to salt/pkg/windows	2016-02-12 21:00:30 -07:00
build.bat	Move build files to salt/pkg/windows	2016-02-12 21:00:30 -07:00
portable.py	Use print as a function [PEP 3105].	2015-12-04 16:17:35 -08:00
req_pip.txt	Move build files to salt/pkg/windows	2016-02-12 21:00:30 -07:00
req.txt	Move build files to salt/pkg/windows	2016-02-12 21:00:30 -07:00