Merge branches 'ignite-4436-2' and 'master' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-4436-2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/2a572c41 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/2a572c41 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/2a572c41 Branch: refs/heads/ignite-4436-2 Commit: 2a572c41bb7555d4ecc85fb0a3972bbc4085caaf Parents: 7fec2f4 d20b7f1 Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Mon Feb 6 08:58:25 2017 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Mon Feb 6 08:58:25 2017 +0700 ---------------------------------------------------------------------- assembly/LICENSE_FABRIC | 35 +++-- assembly/LICENSE_HADOOP | 17 ++- examples/schema-import/bin/h2-server.bat | 2 +- examples/schema-import/bin/h2-server.sh | 4 +- .../schema-import/bin/schema-import.properties | 2 +- .../src/main/resources/META-INF/licenses.txt.vm | 7 +- .../apache/ignite/IgniteSystemProperties.java | 8 ++ .../ignite/lang/IgniteProductVersion.java | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 8 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../IgniteSqlEntryCacheModeAgnosticTest.java | 140 +++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 2 + .../views/templates/agent-download.jade | 2 +- modules/web-console/web-agent/README.txt | 2 +- 14 files changed, 193 insertions(+), 40 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a572c41/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/2a572c41/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java ----------------------------------------------------------------------