Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-104
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6f042aee Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6f042aee Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6f042aee Branch: refs/heads/ignite-104 Commit: 6f042aeef97b1624394bca06b7659c4c835b4a89 Parents: e3ebcb9 01c3e09 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Tue Aug 4 11:26:13 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Tue Aug 4 11:26:13 2015 -0700 ---------------------------------------------------------------------- .../cache/GridCacheSwapPreloadSelfTest.java | 2 + .../query/h2/twostep/GridMergeIndex.java | 7 +++ .../h2/twostep/GridMergeIndexUnsorted.java | 23 +++++++-- .../query/h2/twostep/GridMergeTable.java | 51 ++++++++------------ .../h2/twostep/GridReduceQueryExecutor.java | 28 +---------- 5 files changed, 47 insertions(+), 64 deletions(-) ----------------------------------------------------------------------
