Merge branch 'ignite-1282' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1282
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/76803923 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/76803923 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/76803923 Branch: refs/heads/ignite-1.5 Commit: 76803923dda7fb346e273aca5079352532b586dd Parents: 4844b3e b751843 Author: Alexey Goncharuk <alexey.goncha...@gmail.com> Authored: Tue Nov 24 14:41:22 2015 +0300 Committer: Alexey Goncharuk <alexey.goncha...@gmail.com> Committed: Tue Nov 24 14:41:22 2015 +0300 ---------------------------------------------------------------------- .../scalar/examples/ScalarCacheExample.scala | 19 +++++++++++++++---- .../test/resources/spring-ping-pong-partner.xml | 18 ------------------ 2 files changed, 15 insertions(+), 22 deletions(-) ----------------------------------------------------------------------