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/17 20:39:03 UTC
[13/14] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.5' into ignite-single-op-get
Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-single-op-get
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/58749e3a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/58749e3a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/58749e3a
Branch: refs/heads/ignite-single-op-get
Commit: 58749e3aba18b4b439bce1beed4daf80da8234d3
Parents: 0666063 3ff71fd
Author: sboikov <sb...@gridgain.com>
Authored: Tue Nov 17 19:43:22 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Nov 17 19:43:22 2015 +0300
----------------------------------------------------------------------
.../apache/ignite/internal/IgniteKernal.java | 9 +-
.../org/apache/ignite/mxbean/IgniteMXBean.java | 8 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 360 +++++++++++----
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 95 ++--
.../messages/TcpDiscoveryAbstractMessage.java | 37 ++
.../TcpDiscoveryStatusCheckMessage.java | 11 +
.../GridCacheLoadOnlyStoreAdapterSelfTest.java | 145 +++++-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 158 ++++---
.../discovery/tcp/TcpDiscoveryRestartTest.java | 10 +-
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 459 ++++++++++++++++++-
.../TcpDiscoveryMulticastIpFinderSelfTest.java | 28 +-
.../testframework/junits/GridAbstractTest.java | 29 +-
.../ignite/util/mbeans/GridMBeanSelfTest.java | 33 +-
modules/flume/README.md | 40 ++
modules/flume/pom.xml | 77 ++++
.../ignite/stream/flume/EventTransformer.java | 36 ++
.../apache/ignite/stream/flume/IgniteSink.java | 186 ++++++++
.../stream/flume/IgniteSinkConstants.java | 35 ++
.../ignite/stream/flume/IgniteSinkTest.java | 142 ++++++
.../stream/flume/IgniteSinkTestSuite.java | 37 ++
.../stream/flume/TestEventTransformer.java | 66 +++
.../flume/src/test/resources/example-ignite.xml | 71 +++
.../GridSpringResourceInjectionSelfTest.java | 143 ++++++
.../processors/resource/spring-resource.xml | 27 ++
.../testsuites/IgniteResourceSelfTestSuite.java | 2 +
pom.xml | 1 +
27 files changed, 1977 insertions(+), 272 deletions(-)
----------------------------------------------------------------------