Merge pull request #25599 from jfindlay/tcp_test

fix transport settings in #25596
This commit is contained in:
Justin Findlay 2015-07-21 17:43:45 -06:00
commit 5c94fe3ad3

View File

@ -522,7 +522,7 @@ class TestDaemon(object):
master_opts['transport'] = 'tcp'
minion_opts['transport'] = 'tcp'
sub_minion_opts['transport'] = 'tcp'
# syndic_master_opts['transport'] = 'raet'
syndic_master_opts['transport'] = 'tcp'
# Set up config options that require internal data
master_opts['pillar_roots'] = {