Merge branches 'ignite-5414' and 'master' of 
https://git-wip-us.apache.org/repos/asf/ignite into ignite-5414


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e7345813
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e7345813
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e7345813

Branch: refs/heads/ignite-5414
Commit: e73458135a0b9b8d7ffafca22521314144517dc7
Parents: ba404af 4b0998e
Author: Alexey Kuznetsov <[email protected]>
Authored: Fri Jun 9 13:50:48 2017 +0700
Committer: Alexey Kuznetsov <[email protected]>
Committed: Fri Jun 9 13:50:48 2017 +0700

----------------------------------------------------------------------
 .../ClientTcpUnreachableMultiNodeSelfTest.java  |  6 +-
 .../ignite/internal/client/GridClientNode.java  |  9 ++-
 .../client/impl/GridClientNodeImpl.java         | 22 +++++-
 .../connection/GridClientNioTcpConnection.java  |  3 +-
 .../PlatformDotNetConfigurationClosure.java     |  8 +-
 .../rest/client/message/GridClientNodeBean.java | 25 ++++++
 .../top/GridTopologyCommandHandler.java         |  1 +
 .../processors/query/h2/sql/GridSqlJoin.java    |  7 ++
 .../query/h2/sql/GridSqlQuerySplitter.java      | 82 ++++++++++++++++++--
 .../query/IgniteSqlSplitterSelfTest.java        | 50 ++++++++++++
 .../Datastream/IDataStreamer.cs                 |  8 +-
 11 files changed, 202 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


Reply via email to