[2/3] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver into apache

2015-12-16 Thread jplevyak 
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver 
into apache


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/0b9ea012
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/0b9ea012
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/0b9ea012

Branch: refs/heads/master
Commit: 0b9ea012c6241c1c7b64523889517a39b70fab40
Parents: 94a61e6 b616e28
Author: John Plevyak 
Authored: Wed Dec 16 16:28:00 2015 -0800
Committer: John Plevyak 
Committed: Wed Dec 16 16:28:00 2015 -0800

--
 ci/tsqa/tests/test_https.py |  68 +-
 configure.ac|   1 +
 doc/admin-guide/plugins/cachekey.en.rst | 361 +++
 doc/admin-guide/plugins/index.en.rst|   1 +
 iocore/net/P_SSLConfig.h|   2 +
 iocore/net/SSLConfig.cc |   1 +
 iocore/net/SSLUtils.cc  |   4 +
 mgmt/BaseManager.h  |   4 +-
 mgmt/FileManager.cc |  88 ++-
 mgmt/FileManager.h  |  17 +-
 mgmt/LocalManager.cc|  15 +
 mgmt/ProcessManager.cc  |  14 +
 mgmt/ProcessManager.h   |   1 +
 mgmt/ProxyConfig.h  |   4 +
 mgmt/Rollback.cc|  49 +-
 mgmt/Rollback.h |  35 +-
 plugins/experimental/Makefile.am|   1 +
 plugins/experimental/cachekey/Makefile.am   |  25 +
 plugins/experimental/cachekey/README.md |  13 +
 plugins/experimental/cachekey/cachekey.cc   | 519 +++
 plugins/experimental/cachekey/cachekey.h|  81 +++
 plugins/experimental/cachekey/common.cc |  38 ++
 plugins/experimental/cachekey/common.h  |  62 ++
 plugins/experimental/cachekey/configs.cc| 428 +
 plugins/experimental/cachekey/configs.h | 161 +
 plugins/experimental/cachekey/pattern.cc| 505 +++
 plugins/experimental/cachekey/pattern.h | 137 
 plugins/experimental/cachekey/plugin.cc | 130 
 .../experimental/cachekey/tests/pattern_test.cc |  66 ++
 .../cachekey/tests/test_cachekey.py | 636 +++
 proxy/Main.cc   |   8 +
 proxy/ParentSelection.cc|   2 +-
 proxy/http/HttpSM.cc|   2 +-
 proxy/http2/HuffmanCodec.cc |   4 +-
 proxy/http2/test_Huffmancode.cc |   2 +
 35 files changed, 3432 insertions(+), 53 deletions(-)
--

[2/3] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

2015-07-02 Thread briang 
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/dc2b07ba
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/dc2b07ba
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/dc2b07ba

Branch: refs/heads/master
Commit: dc2b07ba90a610024fcf389eb904738f0d80fc80
Parents: 440a145 7b0a57f
Author: Brian Geffon 
Authored: Thu Jul 2 00:08:20 2015 -0700
Committer: Brian Geffon 
Committed: Thu Jul 2 00:08:20 2015 -0700

--
 Makefile.am |   9 +-
 .../configuration/records.config.en.rst |   6 ++
 iocore/hostdb/I_HostDBProcessor.h   |   1 -
 iocore/hostdb/P_HostDBProcessor.h   |  10 +-
 iocore/net/P_SSLConfig.h|   1 +
 iocore/net/P_SSLNetVConnection.h|  27 +
 iocore/net/SSLConfig.cc |   3 +
 iocore/net/SSLNetVConnection.cc |  65 +++-
 iocore/net/SSLNextProtocolAccept.cc |   3 +-
 iocore/net/UnixNetVConnection.cc|  23 -
 mgmt/RecordsConfig.cc   |  20 +---
 proxy/ProtocolProbeSessionAccept.cc |  33 --
 proxy/http/HttpClientSession.cc |  13 +++
 proxy/http/HttpSM.cc|  60 ++-
 tools/changelog.pl  | 102 +++
 15 files changed, 312 insertions(+), 64 deletions(-)
--

[2/3] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

2015-04-23 Thread shinrich 
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/cd4209bd
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/cd4209bd
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/cd4209bd

Branch: refs/heads/master
Commit: cd4209bdfb50ddb883b17a6f498f55b5812f33f3
Parents: a5a2380 a777a14
Author: shinrich 
Authored: Thu Apr 23 14:24:27 2015 -0500
Committer: shinrich 
Committed: Thu Apr 23 14:24:27 2015 -0500

--
 CHANGES | 4 
 lib/ts/ink_atomic.h | 2 +-
 lib/ts/ink_memory.h | 3 ---
 lib/ts/signals.cc   | 2 +-
 mgmt/utils/MgmtSocket.cc| 2 +-
 proxy/InkAPI.cc | 2 +-
 proxy/Main.cc   | 4 ++--
 proxy/api/ts/ts.h   | 2 +-
 proxy/http/HttpSM.cc| 2 ++
 proxy/http/remap/RemapConfig.cc | 3 ++-
 proxy/logging/LogUtils.cc   | 4 
 11 files changed, 19 insertions(+), 11 deletions(-)
--

[2/3] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

2015-02-13 Thread briang 
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/7740857b
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/7740857b
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/7740857b

Branch: refs/heads/master
Commit: 7740857bbc2517d7e20a08cb6d4a1a7ed2ada728
Parents: d7013ee c111e3f
Author: Brian Geffon 
Authored: Fri Feb 13 15:57:31 2015 -0800
Committer: Brian Geffon 
Committed: Fri Feb 13 15:57:31 2015 -0800

--
 CHANGES |   4 +
 configure.ac|  31 +++
 .../api/TSHttpTxnClientPacketMarkSet.en.rst |   3 +-
 .../api/TSHttpTxnClientPacketTosSet.en.rst  |   3 +-
 .../api/TSHttpTxnServerPacketMarkSet.en.rst |   3 +-
 .../api/TSHttpTxnServerPacketTosSet.en.rst  |   3 +-
 .../configuration/records.config.en.rst | 216 ++-
 iocore/net/SSLUtils.cc  |  40 ++--
 proxy/Main.cc   |   6 +-
 proxy/ParentSelection.cc|   4 +-
 10 files changed, 228 insertions(+), 85 deletions(-)
--

[2/3] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

2015-01-22 Thread shinrich 
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

Conflicts:
iocore/net/UnixNetVConnection.cc


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/179bb986
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/179bb986
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/179bb986

Branch: refs/heads/master
Commit: 179bb9865289f74f79deed35786fefaedb0bb2d1
Parents: 534d52f b2adc70
Author: shinrich 
Authored: Thu Jan 22 08:02:42 2015 -0600
Committer: shinrich 
Committed: Thu Jan 22 08:02:42 2015 -0600

--
 iocore/net/UnixNet.cc| 2 +-
 iocore/net/UnixNetVConnection.cc | 3 +--
 mgmt/RecordsConfig.cc| 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
--

[2/3] trafficserver git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/trafficserver

2014-11-11 Thread sudheerv 
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/44481490
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/44481490
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/44481490

Branch: refs/heads/master
Commit: 44481490ecfaaae682d1f7de6de3cdbe4c317ee2
Parents: 325b418 8af7885
Author: Sudheer Vinukonda 
Authored: Tue Nov 11 19:43:18 2014 +
Committer: Sudheer Vinukonda 
Committed: Tue Nov 11 19:43:18 2014 +

--
 doc/reference/configuration/records.config.en.rst | 10 ++
 iocore/eventsystem/I_ProxyAllocator.h | 10 ++
 iocore/eventsystem/ProxyAllocator.cc  | 10 ++
 mgmt/RecordsConfig.cc |  4 +++-
 4 files changed, 25 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/44481490/mgmt/RecordsConfig.cc
--