Merge branch 'ignite-sprint-7' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-950
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/136453d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/136453d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/136453d2 Branch: refs/heads/ignite-950 Commit: 136453d263e27049e7865191f9f302214d51b881 Parents: 048d711 e91bc48 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Tue Jun 30 17:10:12 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Tue Jun 30 17:10:12 2015 -0700 ---------------------------------------------------------------------- .../configuration/CacheConfiguration.java | 105 +++---- .../configuration/NearCacheConfiguration.java | 10 +- .../ignite/internal/GridKernalContextImpl.java | 2 +- .../discovery/GridDiscoveryManager.java | 32 +- .../cache/GridCacheDeploymentManager.java | 10 +- .../processors/cache/GridCacheProcessor.java | 62 +++- .../processors/clock/GridClockServer.java | 21 +- .../shmem/IpcSharedMemoryServerEndpoint.java | 10 +- .../util/VisorClusterGroupEmptyException.java | 6 +- .../TcpDiscoveryMulticastIpFinder.java | 74 ++++- .../core/src/test/config/spark/spark-config.xml | 46 +++ .../IgniteTopologyPrintFormatSelfTest.java | 289 +++++++++++++++++++ .../cache/GridCacheDaemonNodeStopSelfTest.java | 119 -------- .../IgniteDaemonNodeMarshallerCacheTest.java | 192 ++++++++++++ .../ignite/testsuites/IgniteBasicTestSuite.java | 1 + .../testsuites/IgniteCacheTestSuite3.java | 1 - .../testsuites/IgniteKernalSelfTestSuite.java | 1 + .../ignite/schema/model/PojoDescriptor.java | 2 + .../apache/ignite/schema/model/PojoField.java | 1 + .../parser/dialect/OracleMetadataDialect.java | 2 +- .../org/apache/ignite/spark/IgniteContext.scala | 50 +++- .../org/apache/ignite/spark/IgniteRddSpec.scala | 18 ++ pom.xml | 12 +- 23 files changed, 836 insertions(+), 230 deletions(-) ----------------------------------------------------------------------
