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 +0000
Committer: Sudheer Vinukonda <sudhe...@yahoo-inc.com>
Committed: Wed Sep 24 17:07:03 2014 +0000

----------------------------------------------------------------------
 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
----------------------------------------------------------------------

Reply via email to