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 +0000 Committer: Sudheer Vinukonda <sudhe...@yahoo-inc.com> Committed: Fri Oct 3 16:46:56 2014 +0000 ---------------------------------------------------------------------- iocore/net/SSLUtils.cc | 8 +++----- proxy/config/records.config.default.in | 6 ++++++ 2 files changed, 9 insertions(+), 5 deletions(-) ----------------------------------------------------------------------
