Merge remote-tracking branch 'remotes/origin/master' into ignite-5272-tx
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f6106511 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f6106511 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f6106511 Branch: refs/heads/ignite-5272-tx Commit: f61065117b0767bcd3626adc1a8d3800bd872a94 Parents: a74f5bf 4b0998e Author: sboikov <[email protected]> Authored: Thu Jun 8 23:10:06 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu Jun 8 23:10:06 2017 +0300 ---------------------------------------------------------------------- .../PlatformDotNetConfigurationClosure.java | 8 +- .../processors/query/h2/sql/GridSqlJoin.java | 7 ++ .../query/h2/sql/GridSqlQuerySplitter.java | 82 ++++++++++++++++++-- .../query/IgniteSqlSplitterSelfTest.java | 50 ++++++++++++ 4 files changed, 133 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
