Merge branches 'ignite-698' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-sprint-3
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b30b14c5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b30b14c5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b30b14c5 Branch: refs/heads/ignite-80 Commit: b30b14c5026dd9cadb6448b6cdd93824298949e4 Parents: 2c92f98 2f05339 Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Apr 10 16:04:38 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Apr 10 16:04:38 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 7 +- .../processors/query/GridQueryProcessor.java | 89 ++++++++++++-------- .../processors/query/h2/IgniteH2Indexing.java | 17 +++- .../query/h2/sql/BaseH2CompareQueryTest.java | 20 +++++ 4 files changed, 95 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
