salt/salt
Colton Myers 5b53bf2597 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/cloud/clouds/linode.py
    salt/states/rabbitmq_policy.py
2016-01-14 16:23:29 -07:00
..
acl Fix typo documention -> documentation 2015-11-04 10:40:08 +01:00
auth Allow for tcp transport in auth 2015-11-11 16:25:39 -07:00
beacons I fail at linting... Fixed my uppercase/lowercase problem 2016-01-11 11:36:54 -07:00
cli Add verify_log to SPM 2015-11-30 12:39:25 -07:00
client Allow setting the cmd_umask from within the roster 2015-12-10 14:49:42 -07:00
cloud Add TLS version imports and add linode driver documentation notices 2016-01-14 11:19:35 -07:00
daemons Make pylint happy 2015-12-03 19:09:30 +03:00
defaults
engines
ext
fileserver Add fix for else code path 2016-01-12 16:43:43 -05:00
grains Lint 2016-01-14 12:24:56 -07:00
log Add "profile" loglevel 2015-11-13 11:14:39 -06:00
modules Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2016-01-14 16:23:29 -07:00
netapi Fix rendering issues for Cherrypy netapi documentation. 2015-12-21 13:26:02 +01:00
output Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2015-12-18 13:55:15 -07:00
pillar make sure *all* ignore_missing slses are catched 2016-01-14 14:18:11 +01:00
proxy Don't use single character variables. 2016-01-14 10:43:11 -07:00
queues
renderers Change Beryllium to 2015.8.3 release 2015-11-16 09:38:04 -07:00
returners Properly save minion list in local_cache for ssh jobs 2015-11-18 13:01:56 -07:00
roster doc: fix warnings + some rendering issues 2015-12-21 13:26:02 +01:00
runners Add CLI Example 2016-01-07 17:11:50 -05:00
sdb
search
serializers
spm Pass full path for digest (SPM) 2015-11-30 10:56:31 -07:00
states Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 2016-01-14 16:23:29 -07:00
templates Fixed duplicate mtu entry in RedHat 7 network configuration. 2015-12-10 23:05:32 -03:00
tops
transport Don't create io_loop before fork 2015-12-11 18:57:27 +03:00
utils Lint 2016-01-14 11:23:35 -07:00
wheel Fix typo 2015-11-11 16:28:40 -07:00
__init__.py
_compat.py
config.py Use a broader test for unset "id" 2016-01-13 21:44:31 +00:00
crypt.py Reinit crypto before calling RSA.generate when generating keys. 2016-01-12 14:20:48 -07:00
exceptions.py
fileclient.py Log retryable transport errors as warnings 2016-01-03 09:32:51 -04:00
key.py
loader.py Flip the sense of the test for items (modules, etc) loaded by the proxy. Now load everything a regular minion would load, and only check to make sure __proxyenabled__ is present for proxymodules and grains 2016-01-14 10:30:06 -07:00
master.py Fix typo an unecessary -> unnecessary 2015-11-04 11:06:16 +01:00
minion.py Lint 2016-01-14 11:23:35 -07:00
payload.py
runner.py RunnerClient support old style commands with kwargs on top level. 2015-09-25 12:47:57 -06:00
scripts.py Merge pull request #29642 from cachedout/issue_29199 2015-12-15 12:02:40 -07:00
state.py change arg to mocked to try test suite collision fix 2016-01-06 15:07:36 -07:00
syspaths.py
template.py Add profile logging for template rendering 2015-11-13 16:47:00 -06:00
textformat.py
version.py Add libgit2 version to versions-report 2016-01-14 09:59:45 -06:00