Merge branch '9005-disable-keepalive'
authorTom Clegg <tom@curoverse.com>
Fri, 19 May 2017 23:17:22 +0000 (19:17 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 19 May 2017 23:17:22 +0000 (19:17 -0400)
commit138eedbea2658ef397c7a58ce48d6f06077ba140
tree55d4fa1bb806b25901720de52c3f45617bc8dfab
parent303424c3f3ed01f65c9f880ff1ff32bc7a46621b
parent83b73a4718f09b106f225d45f08e10ae92ce3f38
Merge branch '9005-disable-keepalive'

refs #9005
refs #11726
refs #11729