Repository: incubator-ignite Updated Branches: refs/heads/ignite-648-windows 0bd556320 -> 1a4040f28
Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-sprint-5 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c75caba1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c75caba1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c75caba1 Branch: refs/heads/ignite-648-windows Commit: c75caba1c38f73818ca48df497c03a15c7f675a7 Parents: 484a0fe d70dbd4 Author: artem.shutak <ashu...@gridgain.com> Authored: Tue May 26 17:03:30 2015 +0300 Committer: artem.shutak <ashu...@gridgain.com> Committed: Tue May 26 17:03:30 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/IgniteCacheProxy.java | 3 +- .../GridDistributedTxRemoteAdapter.java | 10 ++-- .../processors/query/GridQueryIndexing.java | 16 +++++ .../processors/query/GridQueryProcessor.java | 52 ++++++---------- .../query/h2/GridH2IndexingGeoSelfTest.java | 20 ++++++- .../processors/query/h2/IgniteH2Indexing.java | 17 ++++++ .../query/h2/opt/GridH2AbstractKeyValueRow.java | 18 ++++-- .../query/h2/opt/GridH2KeyValueRowOffheap.java | 4 +- .../query/h2/sql/GridSqlOperationType.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 2 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 2 +- .../local/IgniteCacheLocalQuerySelfTest.java | 6 ++ .../visor/commands/node/VisorNodeCommand.scala | 2 +- .../commands/tasks/VisorTasksCommand.scala | 2 +- .../scala/org/apache/ignite/visor/visor.scala | 63 ++++++++++++++++++-- 15 files changed, 161 insertions(+), 58 deletions(-) ----------------------------------------------------------------------
