Merge branch 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-341
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/02aa6124 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/02aa6124 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/02aa6124 Branch: refs/heads/ignite-494b Commit: 02aa612451a045a65f08c85166c9e2b269aed46a Parents: debc982 56bccde Author: S.Vladykin <svlady...@gridgain.com> Authored: Wed Mar 25 14:54:17 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Wed Mar 25 14:54:17 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/schema/Demo.java | 2 +- .../examples/ScalarCacheAffinityExample.scala | 8 +++--- .../scalar/examples/ScalarCacheExample.scala | 4 +-- .../ScalarCachePopularNumbersExample.scala | 6 ++--- .../examples/ScalarCacheQueryExample.scala | 2 +- .../scalar/examples/ScalarClosureExample.scala | 5 +++- .../examples/ScalarContinuationExample.scala | 7 +++-- .../examples/ScalarCreditRiskExample.scala | 5 +++- .../scalar/examples/ScalarJvmCloudExample.scala | 2 +- .../scalar/examples/ScalarPingPongExample.scala | 5 +++- .../scalar/examples/ScalarPrimeExample.scala | 4 +-- .../scalar/examples/ScalarScheduleExample.scala | 5 +++- .../examples/ScalarSnowflakeSchemaExample.scala | 4 +-- .../scalar/examples/ScalarTaskExample.scala | 5 +++- .../examples/ScalarWorldShortestMapReduce.scala | 5 +++- .../dht/GridPartitionedGetFuture.java | 6 +---- .../test/config/load/cache-client-benchmark.xml | 13 ---------- .../GridCacheAbstractRemoveFailureTest.java | 8 ++++-- ...idCacheValueConsistencyAbstractSelfTest.java | 27 +++++++++++++++++--- .../IgniteCacheFailoverTestSuite.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - 21 files changed, 77 insertions(+), 48 deletions(-) ----------------------------------------------------------------------
