Merge remote-tracking branch 'remotes/origin/ignite-94' into sprint-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/26914216 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/26914216 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/26914216 Branch: refs/heads/sprint-1 Commit: 269142161a9f74b496fe753b5ab831714268e8f3 Parents: 6127f17 b4ec6e0 Author: avinogradov <avinogra...@gridgain.com> Authored: Tue Jan 27 12:30:34 2015 +0300 Committer: avinogradov <avinogra...@gridgain.com> Committed: Tue Jan 27 12:30:34 2015 +0300 ---------------------------------------------------------------------- examples/config/example-cache.xml | 9 +- examples/config/example-compute.xml | 9 +- examples/config/example-streamer.xml | 9 +- examples/config/filesystem/example-ggfs.xml | 9 +- .../examples/misc/springbean/spring-bean.xml | 9 +- .../examples/ScalarStartStopExample.scala | 73 ------- .../examples/IgniteFsExamplesSelfTest.java | 26 +-- .../tests/examples/ScalarExamplesSelfTest.scala | 5 - modules/core/src/test/config/ggfs-loopback.xml | 41 +--- .../core/src/test/config/ggfs-no-endpoint.xml | 199 ------------------- modules/core/src/test/config/ggfs-shmem.xml | 41 +--- .../test/resources/spring-ping-pong-partner.xml | 38 +--- 12 files changed, 37 insertions(+), 431 deletions(-) ----------------------------------------------------------------------
