Merge remote-tracking branch 'origin/sprint-2' into sprint-2
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fa4157ff Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fa4157ff Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fa4157ff Branch: refs/heads/ignite-573 Commit: fa4157fff4711db193f8cb3308c89549d8df7744 Parents: 470b541 10be140 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Wed Mar 25 15:22:44 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Wed Mar 25 15:22:44 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/schema/Demo.java | 2 +- .../scalar/examples/ScalarCacheAffinityExample.scala | 8 ++++---- .../ignite/scalar/examples/ScalarCacheExample.scala | 4 ++-- .../examples/ScalarCachePopularNumbersExample.scala | 6 +++--- .../scalar/examples/ScalarCacheQueryExample.scala | 2 +- .../ignite/scalar/examples/ScalarClosureExample.scala | 5 ++++- .../scalar/examples/ScalarContinuationExample.scala | 7 +++++-- .../scalar/examples/ScalarCreditRiskExample.scala | 5 ++++- .../scalar/examples/ScalarJvmCloudExample.scala | 2 +- .../scalar/examples/ScalarPingPongExample.scala | 5 ++++- .../ignite/scalar/examples/ScalarPrimeExample.scala | 4 ++-- .../scalar/examples/ScalarScheduleExample.scala | 5 ++++- .../examples/ScalarSnowflakeSchemaExample.scala | 4 ++-- .../ignite/scalar/examples/ScalarTaskExample.scala | 5 ++++- .../examples/ScalarWorldShortestMapReduce.scala | 5 ++++- .../cache/GridCacheSwapPreloadSelfTest.java | 14 ++++++++------ .../cache/distributed/GridCacheEventAbstractTest.java | 8 +++----- .../testsuites/IgniteCacheFailoverTestSuite.java | 1 + .../ignite/testsuites/IgniteCacheTestSuite.java | 1 - 19 files changed, 57 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
