Colton Myers e29be766bb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 ... Conflicts: debian/changelog doc/man/salt.7 salt/cloud/__init__.py salt/cloud/clouds/proxmox.py salt/cloud/clouds/vmware.py salt/config.py salt/fileclient.py salt/minion.py salt/modules/chocolatey.py salt/modules/localemod.py salt/modules/pacman.py salt/modules/pkgng.py salt/modules/schedule.py salt/modules/state.py salt/modules/win_file.py salt/modules/win_pkg.py salt/state.py salt/states/file.py salt/utils/args.py tests/unit/states/file_test.py		2015-07-30 16:54:44 -06:00
..
_syspaths.py	SmartOS esky packaging: minor fixup	2014-01-24 09:47:37 -05:00
BUILD_ENVIRONMENT.md	patchelf lives in pkgsrc	2015-07-28 10:03:20 -06:00
build-tarball.sh	SmartOS Esky: fix build version identification	2015-01-21 20:06:48 -05:00
install.sh	smartos esky: improve "installer"	2014-05-08 12:04:22 -04:00
raet_requirements.txt	move requirements files into requirements dir	2014-12-27 17:29:03 -07:00
requirements.txt	cleanup of python requirements	2015-07-27 09:04:23 -06:00
salt-master.xml	SmartOS Esky Packaging: Fix PATH for services	2014-01-23 15:31:44 -05:00
salt-minion.xml	SmartOS Esky: Fix minion SMF manifest	2014-09-08 16:07:48 -04:00
salt-syndic.xml	SmartOS Esky Packaging: Fix PATH for services	2014-01-23 15:31:44 -05:00
sodium_grabber_installer.py	sodium_grabber_installer: fix kwarg spacing	2014-08-22 12:04:34 -07:00
sodium_grabber.c	SmartOS esky packaging of 2014.7	2014-08-21 16:01:46 -04:00
zeromq_requirements.txt	move requirements files into requirements dir	2014-12-27 17:29:03 -07:00