Colton Myers 000de95974 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop ... Conflicts: .pylintrc doc/ref/runners/all/salt.runners.nacl.rst doc/topics/cloud/config.rst salt/cli/salt.py salt/client/mixins.py salt/client/ssh/__init__.py salt/loader.py salt/minion.py salt/modules/cassandra_cql.py salt/modules/gpg.py salt/modules/grains.py salt/modules/iptables.py salt/modules/yumpkg.py salt/netapi/rest_cherrypy/app.py salt/renderers/pyobjects.py salt/returners/mysql.py salt/runners/jobs.py salt/state.py salt/states/file.py salt/states/service.py salt/utils/minions.py tests/integration/__init__.py tests/integration/netapi/rest_tornado/test_app.py tests/integration/states/cmd.py		2015-04-16 12:15:44 -06:00
..
_syspaths.py	SmartOS esky packaging: minor fixup	2014-01-24 09:47:37 -05:00
BUILD_ENVIRONMENT.md	SmartOS Esky: pkgsrc 2014Q4 Build Environment	2015-04-02 11:27:22 -04: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	move requirements files into requirements dir	2014-12-27 17:29:03 -07: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