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
..
esky	Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop	2015-04-16 12:15:44 -06:00
salt-master.xml	pkg/smartos : fix the manifest of salt-master to start@boot	2013-05-30 20:33:16 +02:00
salt-minion.xml	Add a method context environment PATH	2014-06-22 11:38:35 +02:00
salt-syndic.xml	smartos : change default config directory for Salt services	2013-05-20 13:00:38 +02:00