Merge remote-tracking branch 'remotes/apache-main/ignite-1.5' into master-main
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ad60979f Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ad60979f Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ad60979f Branch: refs/heads/ignite-1093-3 Commit: ad60979f111c9786f9da225f7c790214857d6f00 Parents: dca9e57 2a8ff1c Author: Denis Magda <[email protected]> Authored: Wed Nov 4 18:02:59 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Wed Nov 4 18:02:59 2015 +0300 ---------------------------------------------------------------------- .../java8/messaging/MessagingExample.java | 7 +- .../src/main/java/org/apache/ignite/Ignite.java | 12 +- .../apache/ignite/internal/IgniteKernal.java | 27 +- .../affinity/GridAffinityAssignmentCache.java | 13 + .../cache/GridCacheAffinityManager.java | 10 + .../GridCachePartitionExchangeManager.java | 24 ++ .../processors/cache/GridCachePreloader.java | 5 + .../cache/GridCachePreloaderAdapter.java | 5 + .../processors/cache/GridCacheProcessor.java | 19 ++ .../dht/preloader/GridDhtForceKeysFuture.java | 14 ++ .../GridDhtPartitionsExchangeFuture.java | 6 + .../dht/preloader/GridDhtPreloader.java | 17 ++ .../processors/job/GridJobProcessor.java | 96 ++++--- .../ignite/spi/discovery/tcp/ServerImpl.java | 21 +- .../TcpDiscoveryClientReconnectMessage.java | 1 + .../messages/TcpDiscoveryDiscardMessage.java | 1 + .../GridTaskFailoverAffinityRunTest.java | 3 + .../processors/cache/CacheNamesSelfTest.java | 69 +++++ ...niteCacheClientNodeChangingTopologyTest.java | 4 +- ...gniteClientReconnectMassiveShutdownTest.java | 84 ++++--- .../tcp/TcpDiscoveryMultiThreadedTest.java | 5 +- .../ignite/testframework/junits/IgniteMock.java | 5 + .../junits/multijvm/IgniteProcessProxy.java | 7 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + modules/rest-http/pom.xml | 6 + .../http/jetty/GridJettyRestProtocol.java | 4 +- .../scala/org/apache/ignite/spark/Entity.scala | 2 +- .../org/apache/ignite/spark/IgniteRDDSpec.scala | 249 +++++++++++++++++++ .../org/apache/ignite/spark/IgniteRddSpec.scala | 249 ------------------- .../org/apache/ignite/IgniteSpringBean.java | 10 +- 30 files changed, 617 insertions(+), 360 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/ad60979f/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ----------------------------------------------------------------------
