| .. |
|
acl
|
|
|
|
auth
|
Merge branch '2015.8' into '2106.3'
|
2016-05-25 13:44:21 -06:00 |
|
beacons
|
Merge branch '2015.8' into '2106.3'
|
2016-05-25 13:44:21 -06:00 |
|
cli
|
Merge branch '2015.8' into '2016.3'
|
2016-05-10 15:13:24 -06:00 |
|
client
|
Only unsub if we have a jid
|
2016-05-24 09:34:41 -06:00 |
|
cloud
|
Don't declare the default network (#33409)
|
2016-05-20 14:24:53 -06:00 |
|
config
|
keep safteychek, we still need it for older configs (#33497)
|
2016-05-25 09:19:41 -06:00 |
|
daemons
|
Merge branch '2015.8' into '2016.3'
|
2016-04-15 13:58:50 -06:00 |
|
defaults
|
|
|
|
engines
|
man pages updated (#33307)
|
2016-05-17 10:24:44 -06:00 |
|
executors
|
Port of #33325 to 2016.3 (#33411)
|
2016-05-20 15:07:27 -06:00 |
|
ext
|
|
|
|
fileserver
|
Merge branch '2015.8' into '2016.3'
|
2016-03-18 11:26:12 -06:00 |
|
grains
|
Ignore cdroms in disks grain
|
2016-05-28 13:19:51 -07:00 |
|
log
|
Remove log grains (#33029)
|
2016-05-03 15:13:55 -07:00 |
|
modules
|
check rabbitmq version and use different api to validate a users password
|
2016-06-02 17:34:26 -04:00 |
|
netapi
|
Merge branch '2015.8' into '2016.3'
|
2016-04-26 12:07:42 -06:00 |
|
output
|
Merge branch '2015.8' into '2016.3'
|
2016-05-16 10:47:12 -06:00 |
|
pillar
|
Sync pillarstack to latest upstream version (#33391)
|
2016-05-20 10:03:22 -07:00 |
|
proxy
|
Merge branch '2015.8' into '2016.3'
|
2016-05-16 10:47:12 -06:00 |
|
queues
|
Change all relevant Boron references to 2016.3.0
|
2016-02-10 15:45:28 -07:00 |
|
renderers
|
Merge branch '2015.8' into '2016.3'
|
2016-05-31 11:02:20 -04:00 |
|
returners
|
Merge branch '2015.8' into '2016.3'
|
2016-05-31 11:02:20 -04:00 |
|
roster
|
|
|
|
runners
|
Merge branch '2015.8' into '2106.3'
|
2016-05-25 13:44:21 -06:00 |
|
sdb
|
|
|
|
search
|
|
|
|
serializers
|
Merge branch '2015.8' into '2016.3'
|
2016-03-18 11:26:12 -06:00 |
|
spm
|
[2016.3] Merge forward from 2015.8 to 2016.3 (#32784)
|
2016-04-25 15:26:09 -06:00 |
|
states
|
Merge pull request #33659 from danslimmon/dockerng-dryrun-33632
|
2016-06-02 10:45:49 -07:00 |
|
templates
|
Merge branch '2015.8' into '2016.3'
|
2016-05-12 16:52:27 -06:00 |
|
thorium
|
return correct value
|
2016-02-08 12:36:24 -07:00 |
|
tops
|
|
|
|
transport
|
Merge branch '2015.8' into '2016.3'
|
2016-06-02 10:01:43 -04:00 |
|
utils
|
backport #33599 to 2016.3 (#33682)
|
2016-06-02 09:38:16 -04: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 '2015.8' into '2016.3'
|
2016-05-09 13:55:06 -06:00 |
|
exceptions.py
|
[2016.3] Merge forward from 2015.8 to 2016.3 (#32784)
|
2016-04-25 15:26:09 -06:00 |
|
fileclient.py
|
Merge branch '2015.8' into '2016.3'
|
2016-05-16 10:47:12 -06:00 |
|
key.py
|
Use cmd_async instead of cmd when calling saltutil.revoke_auth (#32931)
|
2016-04-29 09:45:46 -07:00 |
|
loader.py
|
Remove log grains (#33029)
|
2016-05-03 15:13:55 -07:00 |
|
master.py
|
Merge branch '2015.8' into '2016.3'
|
2016-04-15 13:58:50 -06:00 |
|
minion.py
|
Fix indentation error in minion.py
|
2016-05-31 16:55:18 -06:00 |
|
payload.py
|
Merge branch '2015.5' into '2015.8'
|
2016-05-06 12:04:06 -06:00 |
|
runner.py
|
|
|
|
scripts.py
|
Don't merge-forward the change to salt/scripts.py
|
2016-05-17 14:11:34 -06:00 |
|
state.py
|
use dictupdate.merge instead of dict.update to merge CLI pillar overrides
|
2016-03-31 17:31:32 -05:00 |
|
syspaths.py
|
Add thorium roots dir to syspaths
|
2016-02-03 18:34:16 -07:00 |
|
template.py
|
Change all relevant Boron references to 2016.3.0
|
2016-02-10 15:45:28 -07:00 |
|
textformat.py
|
|
|
|
version.py
|
Prevent traceback when deprecation warnings reference Oxygen (#32634)
|
2016-04-16 12:38:18 -06:00 |
