Merge branches 'ignite-692' and 'ignite-sprint-3' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-692
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cd09524e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cd09524e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cd09524e Branch: refs/heads/ignite-718 Commit: cd09524ea4b43cf04d027da87ff567b0d95cc6ec Parents: abc90ec dedcda1 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Apr 10 22:41:21 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Apr 10 22:41:21 2015 +0700 ---------------------------------------------------------------------- examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../configuration/CacheConfiguration.java | 7 +- .../processors/query/GridQueryProcessor.java | 89 +++++++++++------- .../ignite/startup/BasicWarmupClosure.java | 9 +- .../cache/IgniteWarmupClosureSelfTest.java | 82 +++++++++++++++++ .../IgniteFairAffinityDynamicCacheSelfTest.java | 96 ++++++++++++++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 5 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 17 +++- .../query/h2/sql/BaseH2CompareQueryTest.java | 20 ++++ modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 53 ++++++----- 37 files changed, 338 insertions(+), 96 deletions(-) ----------------------------------------------------------------------
