Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Merge pull request #24373 from basepi/merge-forward-develop

Merge forward from 2015.5 to develop
latest commit 6c84fa03a0
@basepi basepi authored
..
Failed to load latest commit information.
acl Lint
auth Fixing more sphinx errors and warnings
beacons Merge pull request #24007 from garethgreenaway/beacon_state_module
cli Merge pull request #24103 from makinacorpus/profiling
client Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
cloud Merge pull request #24324 from nmadhok/vmware-cloud-driver
daemons Changed the now deprecated .postinitio to ._prepare
defaults Check python major version, add shell code py3 compat.
engines Fixing sphinx/docs errors and warnings
ext Absolute import on new win_inet_pton.py
fileserver Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
grains Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
log speed up console log colors by using %-formatting
modules Reformat lxc.py and fix a bad merge conflict resolution
netapi Fix formatting of example curl command in netapi.rest_cherrypy docs
output Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
pillar Merge pull request #24188 from aneeshusa/add-sqlite-pillar
proxy Gate requests import
queues tone down the "'s
renderers Add new module type for serializers from issue #22257.
returners Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
roster Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
runners Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
sdb Fixing more sphinx/docs errors and warnings
search Py3 compatibility fixes.
serializers Add new module type for serializers from issue #22257.
states Merge pull request #24373 from basepi/merge-forward-develop
templates Added new RH route template for RHEL6 and newer
tops Move `salt.utils.six` to `salt.ext.six`
transport Add ZMQ socket monitor for master queue channel
utils Merge pull request #23915 from terminalmage/issue7772
wheel Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
__init__.py It's incompatible-py3-code
_compat.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
config.py Merge pull request #24075 from DSRCompany/raet_bufcnt_conf
crypt.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
exceptions.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
fileclient.py Read response buffer instad of httpsresponse
key.py Merge pull request #23634 from cachedout/issue_23629
loader.py Add new module type for serializers from issue #22257.
master.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
minion.py Move loading of ipaddress module where it belongs
overstate.py Whitespace fix
payload.py Whitespace fix
runner.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
scripts.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
state.py Add `name` kwarg to STATE_RUNTIME_KEYWORDS
syspaths.py Merge remote-tracking branch 'upstream/2015.2' into merge-forward-dev…
template.py Add REST driver for SDB
textformat.py speed up console log colors by using %-formatting
version.py Merge remote-tracking branch 'upstream/2015.5' into merge-forward-dev…
Something went wrong with that request. Please try again.