Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5372863c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5372863c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5372863c Branch: refs/heads/master Commit: 5372863ceaba00376017b24b7bdd79e0721c5543 Parents: 5edc426 7fab676 Author: Andrei Shakirin <[email protected]> Authored: Tue Jul 1 23:13:33 2014 +0200 Committer: Andrei Shakirin <[email protected]> Committed: Tue Jul 1 23:13:33 2014 +0200 ---------------------------------------------------------------------- .../apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java | 2 +- .../apache/cxf/transport/https/HttpsURLConnectionFactory.java | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
