Merge remote-tracking branch 'origin/ignite-sprint-3' 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/98af3189 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/98af3189 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/98af3189 Branch: refs/heads/ignite-718 Commit: 98af3189c1955fe0e2fc83fa8beac5eca3d0d645 Parents: 045973b 660ed78 Author: Anton Vinogradov <avinogra...@gridgain.com> Authored: Fri Apr 10 16:13:04 2015 +0300 Committer: Anton Vinogradov <avinogra...@gridgain.com> Committed: Fri Apr 10 16:13:04 2015 +0300 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 7 +- .../processors/query/GridQueryProcessor.java | 89 +++++++++++------- .../IgniteFairAffinityDynamicCacheSelfTest.java | 96 ++++++++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../processors/query/h2/IgniteH2Indexing.java | 17 +++- .../query/h2/sql/BaseH2CompareQueryTest.java | 20 ++++ 6 files changed, 192 insertions(+), 38 deletions(-) ----------------------------------------------------------------------
