Merge branch 'master' into ignite-4475-async
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/055295ed Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/055295ed Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/055295ed Branch: refs/heads/ignite-4475-async Commit: 055295edd2713dc67a5c3bd5000e51caf1145049 Parents: 5cf6dc4 0726d32 Author: devozerov <voze...@gridgain.com> Authored: Mon Feb 6 17:50:55 2017 +0300 Committer: devozerov <voze...@gridgain.com> Committed: Mon Feb 6 17:50:55 2017 +0300 ---------------------------------------------------------------------- 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 + .../Cache/CacheAbstractTransactionalTest.cs | 105 +++++++------- .../Apache.Ignite.Core/Impl/Cache/CacheImpl.cs | 9 +- .../views/templates/agent-download.jade | 2 +- modules/web-console/web-agent/README.txt | 2 +- .../cache/IgnitePutRemoveBenchmark.java | 42 ++++++ .../cache/IgnitePutRemoveTxBenchmark.java | 30 ++++ 18 files changed, 323 insertions(+), 96 deletions(-) ----------------------------------------------------------------------