Merge branches 'ignite-973' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-6
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/1cc00000 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1cc00000 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1cc00000 Branch: refs/heads/ignite-1026 Commit: 1cc00000a641f3d52964710377a8c29d9ff59947 Parents: 309eeb0 774bc94 Author: S.Vladykin <svlady...@gridgain.com> Authored: Mon Jun 22 09:47:29 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Mon Jun 22 09:47:29 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheSwapManager.java | 12 +- .../offheap/GridOffHeapProcessor.java | 19 +- .../apache/ignite/internal/util/GridDebug.java | 37 ++-- .../processors/query/h2/IgniteH2Indexing.java | 2 + .../query/h2/twostep/GridMapQueryExecutor.java | 23 ++- .../cache/IgniteCacheOffheapEvictQueryTest.java | 179 +++++++++++++++++++ .../IgniteCacheQuerySelfTestSuite.java | 1 + 7 files changed, 233 insertions(+), 40 deletions(-) ----------------------------------------------------------------------
