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/c3768f74 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c3768f74 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c3768f74 Branch: refs/heads/ignite-573 Commit: c3768f74c6cc5c6ac19e8cf54c4dd4ce5da5ac3f Parents: 32a441f 56bccde Author: sboikov <sboi...@gridgain.com> Authored: Wed Mar 25 14:54:37 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Wed Mar 25 14:54:37 2015 +0300 ---------------------------------------------------------------------- .../src/main/java/org/apache/ignite/schema/Demo.java | 2 +- .../ignite/scalar/examples/ScalarCacheAffinityExample.scala | 8 ++++---- .../apache/ignite/scalar/examples/ScalarCacheExample.scala | 4 ++-- .../scalar/examples/ScalarCachePopularNumbersExample.scala | 6 +++--- .../ignite/scalar/examples/ScalarCacheQueryExample.scala | 2 +- .../apache/ignite/scalar/examples/ScalarClosureExample.scala | 5 ++++- .../ignite/scalar/examples/ScalarContinuationExample.scala | 7 +++++-- .../ignite/scalar/examples/ScalarCreditRiskExample.scala | 5 ++++- .../ignite/scalar/examples/ScalarJvmCloudExample.scala | 2 +- .../ignite/scalar/examples/ScalarPingPongExample.scala | 5 ++++- .../apache/ignite/scalar/examples/ScalarPrimeExample.scala | 4 ++-- .../ignite/scalar/examples/ScalarScheduleExample.scala | 5 ++++- .../scalar/examples/ScalarSnowflakeSchemaExample.scala | 4 ++-- .../apache/ignite/scalar/examples/ScalarTaskExample.scala | 5 ++++- .../scalar/examples/ScalarWorldShortestMapReduce.scala | 5 ++++- 15 files changed, 45 insertions(+), 24 deletions(-) ----------------------------------------------------------------------