[2/2] 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/8b5f4ead Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/8b5f4ead Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/8b5f4ead Branch: refs/heads/master Commit: 8b5f4ead642ace5cafd108e59d16310b45fdc7c3 Parents: 98981da bbdd3ee Author: Brian Geffon bri...@apache.org Authored: Wed Oct 22 17:49:49 2014 -0700 Committer: Brian Geffon bri...@apache.org Committed: Wed Oct 22 17:49:49 2014 -0700 -- CHANGES | 2 + doc/admin/cluster-howto.en.rst | 111 ++-- doc/admin/configuring-cache.en.rst | 213 +++--- doc/admin/configuring-traffic-server.en.rst | 22 +- doc/admin/event-logging-formats.en.rst | 228 +-- doc/admin/explicit-proxy-caching.en.rst | 34 +- doc/admin/faqs.en.rst | 385 --- doc/admin/forward-proxy.en.rst | 146 +++-- doc/admin/getting-started.en.rst| 155 ++--- doc/admin/hierachical-caching.en.rst| 137 ++-- doc/admin/http-proxy-caching.en.rst | 657 +++ doc/admin/index.en.rst | 114 ++-- doc/admin/monitoring-traffic.en.rst | 54 +- doc/admin/performance-tuning.en.rst | 30 +- doc/admin/reverse-proxy-http-redirects.en.rst | 190 +++--- doc/admin/security-options.en.rst | 268 doc/admin/session-protocol.en.rst | 50 +- doc/admin/traffic-server-error-messages.en.rst | 99 +-- doc/admin/transparent-proxy.en.rst | 69 +- doc/admin/working-log-files.en.rst | 574 .../api/TSHttpConnectWithPluginId.en.rst| 81 ++- doc/reference/commands/index.en.rst | 20 +- .../configuration/logs_xml.config.en.rst| 6 +- 23 files changed, 2133 insertions(+), 1512 deletions(-) --
[2/2] 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/644f5891 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/644f5891 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/644f5891 Branch: refs/heads/master Commit: 644f5891369667c5b1610e34732e413d367912a6 Parents: cec1d99 c316ded Author: Manjesh Nilange manjeshnila...@yahoo.com Authored: Mon Oct 20 14:44:50 2014 -0700 Committer: Manjesh Nilange manjeshnila...@yahoo.com Committed: Mon Oct 20 14:44:50 2014 -0700 -- CHANGES | 2 ++ proxy/http/HttpSM.cc | 13 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) --
[2/2] 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/4ace7193 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/4ace7193 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/4ace7193 Branch: refs/heads/master Commit: 4ace71932dc0c3cbbc9b6446204dd86156b2315e Parents: 0be3861 e15d3d3 Author: Sudheer Vinukonda sudhe...@yahoo-inc.com Authored: Fri Oct 3 16:46:56 2014 + Committer: Sudheer Vinukonda sudhe...@yahoo-inc.com Committed: Fri Oct 3 16:46:56 2014 + -- iocore/net/SSLUtils.cc | 8 +++- proxy/config/records.config.default.in | 6 ++ 2 files changed, 9 insertions(+), 5 deletions(-) --
[2/2] 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/42271ef6 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/42271ef6 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/42271ef6 Branch: refs/heads/master Commit: 42271ef64b6a0134cbf081a49a523953ec3c59b5 Parents: c39484a fc81a02 Author: Sudheer Vinukonda sudhe...@yahoo-inc.com Authored: Thu Sep 25 16:20:58 2014 + Committer: Sudheer Vinukonda sudhe...@yahoo-inc.com Committed: Thu Sep 25 16:20:58 2014 + -- iocore/net/SSLUtils.cc | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) --
[2/2] 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/60e8d976 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/60e8d976 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/60e8d976 Branch: refs/heads/master Commit: 60e8d97641dff84c8fd62ba4c81286eabedcdfdc Parents: 2280dc3 80eb1a8 Author: Sudheer Vinukonda sudhe...@yahoo-inc.com Authored: Wed Sep 24 17:07:03 2014 + Committer: Sudheer Vinukonda sudhe...@yahoo-inc.com Committed: Wed Sep 24 17:07:03 2014 + -- doc/reference/api/TSVConnSslConnectionGet.en.rst| 2 +- iocore/net/SSLNetVConnection.cc | 4 iocore/net/SSLUtils.cc | 6 +++--- lib/ts/ink_file.cc | 2 +- plugins/experimental/ssl_cert_loader/ssl-cert-loader.cc | 3 +-- 5 files changed, 10 insertions(+), 7 deletions(-) -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60e8d976/iocore/net/SSLNetVConnection.cc -- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/60e8d976/iocore/net/SSLUtils.cc --
[2/2] 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/ecf79063 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ecf79063 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ecf79063 Branch: refs/heads/master Commit: ecf790630e8a726e76e38e379673b4a88d94cd39 Parents: b4b4109 04a108f Author: Sudheer Vinukonda sudhe...@yahoo-inc.com Authored: Fri Sep 12 17:02:35 2014 + Committer: Sudheer Vinukonda sudhe...@yahoo-inc.com Committed: Fri Sep 12 17:02:35 2014 + -- cmd/traffic_manager/traffic_manager.cc | 1 + 1 file changed, 1 insertion(+) --
[2/2] 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/03c19353 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/03c19353 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/03c19353 Branch: refs/heads/master Commit: 03c193537262a6ee9fe45203dedffa295ae5a9ad Parents: 045bfbd ae56b90 Author: Sudheer Vinukonda sudhe...@yahoo-inc.com Authored: Fri Sep 5 18:09:44 2014 + Committer: Sudheer Vinukonda sudhe...@yahoo-inc.com Committed: Fri Sep 5 18:09:44 2014 + -- CHANGES| 2 ++ cmd/traffic_manager/traffic_manager.cc | 5 +++-- proxy/Main.cc | 28 ++-- 3 files changed, 19 insertions(+), 16 deletions(-) --
[2/2] 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/731d35d3 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/731d35d3 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/731d35d3 Branch: refs/heads/master Commit: 731d35d38debc9ec332557a324ea561329cc4e94 Parents: e52ce1a 55961c8 Author: Brian Geffon bri...@apache.org Authored: Fri Aug 22 10:24:55 2014 -0700 Committer: Brian Geffon bri...@apache.org Committed: Fri Aug 22 10:24:55 2014 -0700 -- CHANGES | 2 ++ proxy/ProtocolProbeSessionAccept.cc | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) --
[2/2] 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/39503639 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/39503639 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/39503639 Branch: refs/heads/master Commit: 3950363913e37ca2c12130f51cfff13993544530 Parents: 2be6402 13cc7d7 Author: Manjesh Nilange manjeshnila...@yahoo.com Authored: Wed Jun 25 14:31:34 2014 -0700 Committer: Manjesh Nilange manjeshnila...@yahoo.com Committed: Wed Jun 25 14:31:34 2014 -0700 -- CHANGES | 185 +- NOTICE |2 +- build/ax_check_openssl.m4 |8 + ci/jenkins/bin/build.sh |8 +- ci/jenkins/bin/clang-analyzer.sh|4 +- ci/jenkins/bin/coverity.sh | 41 + ci/jenkins/bin/environment.sh |6 + ci/jenkins/bin/in_tree.sh | 21 +- ci/jenkins/bin/out_of_tree.sh | 31 +- ci/jenkins/bin/rat.sh |4 + ci/jenkins/bin/snapshot.sh |6 - ci/rat-excludes.txt | 129 - ci/rat-regex.txt|3 + cmd/Makefile.am |2 +- cmd/traffic_cop/traffic_cop.cc |2 +- cmd/traffic_line/traffic_line.cc| 20 +- cmd/traffic_shell/CliCreateCommands.cc | 310 -- cmd/traffic_shell/CliCreateCommands.h | 39 - cmd/traffic_shell/CliDisplay.cc | 221 - cmd/traffic_shell/CliDisplay.h | 91 - cmd/traffic_shell/CliMgmtUtils.cc | 586 --- cmd/traffic_shell/CliMgmtUtils.h| 150 - cmd/traffic_shell/ConfigCmd.cc | 4156 -- cmd/traffic_shell/ConfigCmd.h | 837 cmd/traffic_shell/ConfigUpgradeCmd.cc | 634 --- cmd/traffic_shell/ConfigUpgradeCmd.h| 252 -- cmd/traffic_shell/ConfigUpgradeReadCmd.cc | 498 --- cmd/traffic_shell/ConfigUpgradeWriteCmd.cc | 517 --- cmd/traffic_shell/Makefile.am | 77 - cmd/traffic_shell/ShowCmd.cc| 2322 -- cmd/traffic_shell/ShowCmd.h | 247 -- cmd/traffic_shell/UtilCmds.cc | 196 - cmd/traffic_shell/UtilCmds.h| 94 - cmd/traffic_shell/cliAppInit.cc | 165 - cmd/traffic_shell/cliParseArg.cc| 457 -- cmd/traffic_shell/cli_detailed_command_list.txt | 1605 --- cmd/traffic_shell/cli_feature_spec.txt | 230 - cmd/traffic_shell/commandOptions.h | 47 - cmd/traffic_shell/createArgument.cc | 387 -- cmd/traffic_shell/createArgument.h | 119 - cmd/traffic_shell/createCommand.cc | 166 - cmd/traffic_shell/createCommand.h | 59 - cmd/traffic_shell/definitions.h | 77 - cmd/traffic_shell/hashtable.cc | 219 - cmd/traffic_shell/hashtable.h | 45 - cmd/traffic_shell/processArgument.cc| 57 - cmd/traffic_shell/traffic_shell.cc | 115 - configure.ac| 300 +- contrib/manifests/omnios.sh |1 - doc/Makefile.am | 32 +- doc/admin/event-logging-formats.en.rst | 10 + doc/admin/hierachical-caching.en.rst|2 +- doc/admin/http-proxy-caching.en.rst | 16 +- doc/admin/index.en.rst |1 + doc/admin/security-options.en.rst |1 - doc/admin/session-protocol.en.rst | 55 + doc/admin/working-log-files.en.rst |2 +- doc/arch/cache/cache-arch.en.rst| 14 +- doc/arch/cache/tier-storage.en.rst |4 +- doc/conf.py | 16 +- doc/ext/traffic-server.py |6 +- .../ja/LC_MESSAGES/admin/security-options.en.po |4 - doc/man/config_alarms.1 | 52 - doc/man/config_cache.1 | 140 - doc/man/config_clock.1 | 64 - doc/man/config_dns.1| 46 - doc/man/config_get.1| 37 - doc/man/config_hard-restart.1 | 31 - doc/man/config_hostdb.1 | 72 - doc/man/config_http.1 | 78 - doc/man/config_icp.1| 72 - doc/man/config_logging.1| 160 - doc/man/config_name.1
[2/2] 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/ea0a9b1b Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ea0a9b1b Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ea0a9b1b Branch: refs/heads/master Commit: ea0a9b1b7a4db07930fde593ac28397f4f6acea3 Parents: 42772cf 2a0ef8a Author: Brian Geffon bri...@apache.org Authored: Wed May 21 13:50:50 2014 -0700 Committer: Brian Geffon bri...@apache.org Committed: Wed May 21 13:50:50 2014 -0700 -- CHANGES | 3 +++ 1 file changed, 3 insertions(+) --
[2/2] 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/47a53bec Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/47a53bec Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/47a53bec Branch: refs/heads/master Commit: 47a53bec100da61c0308a78c35d90e9fbac7f7a9 Parents: 8176151 2b35ff4 Author: Brian Geffon bri...@apache.org Authored: Tue Mar 11 11:05:16 2014 -0700 Committer: Brian Geffon bri...@apache.org Committed: Tue Mar 11 11:05:16 2014 -0700 -- ci/tsqa/test-log-configuration | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) --
[2/2] 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/2b6a5f6b Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2b6a5f6b Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2b6a5f6b Branch: refs/heads/master Commit: 2b6a5f6bb391109f669b6f51b724da01d09c60a0 Parents: 5dcbbb1 e4a806d Author: Kit Chan kic...@apache.org Authored: Tue Dec 3 23:36:18 2013 + Committer: Kit Chan kic...@apache.org Committed: Tue Dec 3 23:36:18 2013 + -- doc/admin/faqs.en.rst | 2 +- doc/reference/configuration/records.config.en.rst | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) --
[2/2] 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/d186ae37 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d186ae37 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d186ae37 Branch: refs/heads/master Commit: d186ae374470c02af6028729d58b40cf53b3e4ce Parents: 9c4fa96 ddce361 Author: Uri Shachar ushac...@apache.org Authored: Sun Apr 28 14:51:56 2013 +0300 Committer: Uri Shachar ushac...@apache.org Committed: Sun Apr 28 14:51:56 2013 +0300 -- plugins/experimental/esi/lib/FailureInfo.h |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --
