Merge remote-tracking branch 'remotes/origin/master' into ignite-6149
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a02bf51e Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a02bf51e Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a02bf51e Branch: refs/heads/ignite-6149 Commit: a02bf51e5eb9fb60ae62cd0f1d36858b0ac9c7dc Parents: 6de99ef d20f302 Author: sboikov <[email protected]> Authored: Tue Aug 29 11:16:17 2017 +0300 Committer: sboikov <[email protected]> Committed: Tue Aug 29 11:16:17 2017 +0300 ---------------------------------------------------------------------- .../jdbc/thin/JdbcThinConnectionSelfTest.java | 16 +++++++++++++++- .../org/apache/ignite/IgniteJdbcThinDriver.java | 4 +++- .../internal/jdbc/thin/JdbcThinConnection.java | 4 +++- .../ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 18 ++++++++++++++++-- .../ignite/internal/jdbc/thin/JdbcThinUtils.java | 14 ++++++++++---- .../processors/odbc/SqlListenerNioListener.java | 16 ++++++++++++++-- .../processors/odbc/jdbc/JdbcRequestHandler.java | 9 ++++++++- 7 files changed, 69 insertions(+), 12 deletions(-) ----------------------------------------------------------------------
