salt/salt
rallytime 6d78adbf08 Merge branch '2016.3' into '2016.11'
Conflicts:
  - doc/topics/tutorials/gitfs.rst
  - salt/fileserver/roots.py
  - salt/loader.py
2017-02-15 10:35:02 -07:00
..
acl
auth Merge pull request #38863 from hujunya/fix_django_auth 2017-02-07 09:42:59 -06:00
beacons Add NameError to exception in avahi_announce beacon 2017-01-12 11:56:49 -07:00
cache Strip .p from cache file names 2017-01-20 15:27:09 -07:00
cli Merge branch '2016.3' into '2016.11' 2017-02-01 13:35:10 -07:00
client Merge branch '2016.3' into '2016.11' 2017-02-03 09:48:58 -07:00
cloud Typo 2017-02-03 14:27:45 -07:00
config Merge pull request #38863 from hujunya/fix_django_auth 2017-02-07 09:42:59 -06:00
daemons Merge branch '2016.3' into '2016.11' 2017-01-13 14:45:36 -07:00
defaults
engines Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (#38899) 2017-01-30 10:32:23 -07:00
executors
ext
fileserver Merge branch '2016.3' into '2016.11' 2017-02-15 10:35:02 -07:00
grains Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
log Merge branch '2016.3' into 'carbon' 2016-10-28 09:25:00 -06:00
modules Merge branch '2016.3' into '2016.11' 2017-02-15 10:35:02 -07:00
netapi fix django auth not work 2017-01-22 15:12:32 +08:00
output Merge pull request #39392 from alprs/fix-nested_output_ordered_dict 2017-02-14 10:50:14 -07:00
pillar Merge branch '2016.3' into '2016.11' 2017-02-15 10:35:02 -07:00
proxy Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (#38899) 2017-01-30 10:32:23 -07:00
queues Create queue if one doesn't exist 2017-01-04 15:40:47 -05:00
renderers Various doc updates to fix warnings in doc build 2017-02-06 16:56:58 -07:00
returners Merge branch '2016.3' into '2016.11' 2017-02-15 10:35:02 -07:00
roster Merge pull request #38799 from aosagie/fix-ansible-dynamic-roster 2017-01-18 08:32:47 -07:00
runners Merge pull request #39233 from rallytime/fixup-more-doc-build-warnings 2017-02-08 12:29:53 -07:00
sdb modify docs to utilize backend:requests 2016-11-07 22:28:32 +01:00
search
serializers Merge branch '2016.3' into 'carbon' 2016-11-08 13:04:33 -07:00
spm Fix merge conflict in SPM 2016-10-25 16:23:33 +09:00
states Merge pull request #39264 from rallytime/merge-2016.11 2017-02-09 10:10:13 -07:00
templates Merge pull request #38043 from MTecknology/2016.11 2016-12-07 10:32:17 -07:00
thorium This is faster and cleaner 2017-01-26 12:13:06 -07:00
tops Remove doc markup references from 2016.11 branch 2016-12-19 15:14:37 -07:00
transport ZMQ: add an option for zmq.BACKLOG to salt master (zmq_backlog) 2016-12-20 09:55:31 -07:00
utils Merge branch '2016.3' into '2016.11' 2017-02-10 10:18:26 -07:00
wheel Add hash_type argument to wheel fingerprint functions 2016-12-28 09:40:10 -07:00
__init__.py
_compat.py
crypt.py
exceptions.py
fileclient.py Merge branch '2016.3' into '2016.11' 2017-01-04 16:54:58 -05:00
key.py Merge pull request #38627 from cachedout/pr-38476 2017-01-06 15:05:45 -07:00
loader.py Merge branch '2016.3' into '2016.11' 2017-02-15 10:35:02 -07:00
master.py Merge pull request #38863 from hujunya/fix_django_auth 2017-02-07 09:42:59 -06:00
minion.py Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (#38899) 2017-01-30 10:32:23 -07:00
payload.py
runner.py
scripts.py Update Carbon versionadded tags to 2016.11.0 in salt/* 2016-10-27 15:00:00 -06:00
state.py Enable __proxy__ availability in states, highstate, and utils. Enable __utils__ availability in proxies. (#38899) 2017-01-30 10:32:23 -07:00
syspaths.py Add thorium path to syspaths (#37767) 2016-11-18 07:40:57 -07:00
template.py Update Carbon versionadded tags to 2016.11.0 in salt/* 2016-10-27 15:00:00 -06:00
textformat.py
version.py Fix some lint 2017-01-25 10:02:27 -07:00