This is an automated email from the ASF dual-hosted git repository. briang pushed a commit to branch master in repository https://git-dual.apache.org/repos/asf/trafficserver.git
commit 2d6d7eb7be507197527e4c85f2b6833ddef2543d Merge: ba22efd f30ae30 Author: Brian Geffon <bg...@users.noreply.github.com> AuthorDate: Fri Apr 22 09:48:56 2016 +0800 Merge pull request #596 from zizhong/62fe5835 TS-3922: Websocket Timeouts, transaction overrideable .../api/functions/TSHttpOverridableConfig.en.rst | 2 ++ lib/ts/apidefs.h.in | 2 ++ proxy/InkAPI.cc | 10 ++++++++++ 3 files changed, 14 insertions(+) -- To stop receiving notification emails like this one, please contact "commits@trafficserver.apache.org" <commits@trafficserver.apache.org>.