You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by br...@apache.org on 2015/07/23 06:01:56 UTC
[5/5] trafficserver git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/trafficserver
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/b2b00406
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/b2b00406
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/b2b00406
Branch: refs/heads/master
Commit: b2b0040669818a3dc51b71617507b37e5d51d5c8
Parents: aa8170a 404e786
Author: Brian Geffon <br...@apache.org>
Authored: Wed Jul 22 21:01:19 2015 -0700
Committer: Brian Geffon <br...@apache.org>
Committed: Wed Jul 22 21:01:19 2015 -0700
----------------------------------------------------------------------
iocore/cache/CacheDisk.cc | 1 +
iocore/net/SSLNetVConnection.cc | 103 +-
lib/raft/raft_impl.h | 1028 +++++++++---------
lib/raft/test_makefile | 17 +
.../ssl_cert_loader/ssl-cert-loader.cc | 8 +-
proxy/http2/test_Huffmancode.cc | 23 +
proxy/spdy/SpdyClientSession.cc | 2 +-
7 files changed, 610 insertions(+), 572 deletions(-)
----------------------------------------------------------------------