Merge branch 'ignite-1.6' of https://git-wip-us.apache.org/repos/asf/ignite
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/608bd82b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/608bd82b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/608bd82b Branch: refs/heads/master Commit: 608bd82be453043264dc7db0f7f32b3171e15264 Parents: b52edca c9f9d24 Author: Sergi Vladykin <[email protected]> Authored: Tue May 17 07:09:23 2016 +0300 Committer: Sergi Vladykin <[email protected]> Committed: Tue May 17 07:09:23 2016 +0300 ---------------------------------------------------------------------- .../cache/query/GridCacheQueryManager.java | 4 +++ .../spi/indexing/IndexingQueryFilter.java | 9 +++++++ .../processors/query/h2/IgniteH2Indexing.java | 4 +++ .../query/h2/opt/GridH2IndexBase.java | 28 ++++++++++++-------- 4 files changed, 34 insertions(+), 11 deletions(-) ----------------------------------------------------------------------
