Merge branch 'master' into 5.0.x
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/1b4e1869 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/1b4e1869 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/1b4e1869 Branch: refs/heads/5.0.x Commit: 1b4e186998a22b9127e5e91829cb575b651ced36 Parents: 3b8c779 54db32b Author: Bryan Call <[email protected]> Authored: Wed Jun 4 12:22:47 2014 -0700 Committer: Bryan Call <[email protected]> Committed: Wed Jun 4 12:22:47 2014 -0700 ---------------------------------------------------------------------- CHANGES | 11 +++++++ configure.ac | 14 ++++---- iocore/aio/Makefile.am | 2 +- iocore/eventsystem/Makefile.am | 2 +- lib/ts/Makefile.am | 2 +- mgmt/Makefile.am | 2 +- proxy/Makefile.am | 8 ++--- proxy/spdy/SpdyCallbacks.cc | 8 ++--- proxy/spdy/SpdyClientSession.cc | 40 ++++++++++++----------- proxy/spdy/SpdyClientSession.h | 2 +- proxy/spdy/SpdyCommon.cc | 38 +++++++++++++++------- proxy/spdy/SpdyCommon.h | 63 ++++++++++++++---------------------- 12 files changed, 104 insertions(+), 88 deletions(-) ----------------------------------------------------------------------
