You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/11/05 09:45:36 UTC
[14/14] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-1.4-slow-server-debug
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.4-slow-server-debug
Conflicts:
modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgnitePutTxBenchmark.java
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/b4fad89d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/b4fad89d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/b4fad89d
Branch: refs/heads/ignite-1.4-slow-server-debug
Commit: b4fad89dfc71016870a13e50b4d3a805e2350553
Parents: f10a22c 2a8ff1c
Author: sboikov <sb...@gridgain.com>
Authored: Thu Nov 5 11:44:32 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Nov 5 11:44:32 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 +
.../ignite/logger/log4j2/Log4J2Logger.java~ | 542 -------------------
.../ignite/logger/log4j2/Log4j2FileAware.java~ | 33 --
.../ignite/logger/log4j2/Log4jFileAware.java~ | 13 -
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 +-
33 files changed, 617 insertions(+), 948 deletions(-)
----------------------------------------------------------------------