salt/salt
rallytime 52111eb01a Merge branch '2016.3' into 'develop'
Conflicts:
  - salt/cloud/clouds/joyent.py
  - salt/minion.py
2016-03-18 16:00:35 -06:00
..
acl
auth Merge branch '2016.3' into 'develop' 2016-03-18 10:57:15 -06:00
beacons Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
cli Make sure logging is correct in daemons.py for unit tests 2016-03-18 14:39:19 -06:00
client Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
cloud Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
config Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
daemons be more consistent with logging.warning vs logging.warn (deprecated) and quoting style 2016-02-22 21:30:15 +00:00
defaults
engines specify defaults for reactor in salt/config 2016-03-14 09:50:54 -06:00
executors
ext
fileserver Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
grains Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
log Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
modules Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
netapi fix lint error for extra newline 2016-03-16 09:41:34 -07:00
output Fix orchestrate outputter when retcode is appended to orchestrate run 2016-02-18 16:35:48 -07:00
pillar Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
proxy Merge branch '2016.3' into 'develop' 2016-03-18 10:57:15 -06:00
queues Change all relevant Boron references to 2016.3.0 2016-02-10 15:45:28 -07:00
renderers be more consistent with logging.warning vs logging.warn (deprecated) and quoting style 2016-02-22 21:30:15 +00:00
returners Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
roster
runners Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
sdb Add pillar module for vault 2016-02-19 14:19:24 -07:00
search
serializers Merge branch '2015.8' into '2016.3' 2016-03-18 11:26:12 -06:00
spm Fix test errors 2016-02-24 18:51:56 -07:00
states Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
templates Merge branch '2016.3' into 'develop' 2016-03-02 13:48:11 -07:00
thorium return correct value 2016-02-08 12:36:24 -07:00
tops
transport Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
utils Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
wheel Merge branch '2015.8' into '2016.3' 2016-03-02 10:26:13 -07:00
__init__.py Merge branch '2015.8' into '2016.3' 2016-03-18 11:26:12 -06:00
_compat.py Merge branch '2015.8' into '2016.3' 2016-03-18 11:26:12 -06:00
crypt.py Merge branch '2016.3' into 'develop' 2016-03-18 10:57:15 -06:00
exceptions.py Merge branch '2015.8' into '2016.3' 2016-03-18 11:26:12 -06:00
fileclient.py Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
key.py Merge branch '2015.8' into '2016.3' 2016-03-02 10:26:13 -07:00
loader.py Merge pull request #31160 from ScoreUnder/module-function-load-order 2016-02-18 11:48:26 -07:00
master.py Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
minion.py Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00
payload.py More pylint fixes 2016-03-15 15:50:05 -06:00
runner.py be more consistent with logging.warning vs logging.warn (deprecated) and quoting style 2016-02-22 21:30:15 +00:00
scripts.py be more consistent with logging.warning vs logging.warn (deprecated) and quoting style 2016-02-22 21:30:15 +00:00
state.py Merge branch '2016.3' into 'develop' 2016-03-18 10:57:15 -06:00
syspaths.py Add thorium roots dir to syspaths 2016-02-03 18:34:16 -07:00
template.py be more consistent with logging.warning vs logging.warn (deprecated) and quoting style 2016-02-22 21:30:15 +00:00
textformat.py
version.py Merge branch '2016.3' into 'develop' 2016-03-18 16:00:35 -06:00