Merge remote-tracking branch 'remotes/origin/master' into ignite-591
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/cfeec2dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cfeec2dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cfeec2dd Branch: refs/heads/ignite-1087 Commit: cfeec2ddb63770dfe28176c3916630753162631c Parents: 839fe79 44b52b4 Author: sevdokimov <sevdoki...@gridgain.com> Authored: Wed Jul 8 14:32:52 2015 +0300 Committer: sevdokimov <sevdoki...@gridgain.com> Committed: Wed Jul 8 14:32:52 2015 +0300 ---------------------------------------------------------------------- .../ignite/spi/discovery/tcp/ServerImpl.java | 20 ++ .../tcp/internal/TcpDiscoveryNode.java | 2 +- .../tcp/internal/TcpDiscoveryNodesRing.java | 8 +- .../tcp/internal/TcpDiscoveryStatistics.java | 10 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 8 +- .../tcp/TcpDiscoveryMultiThreadedTest.java | 38 ++++ .../IgniteSpiDiscoverySelfTestSuite.java | 3 + modules/kafka/licenses/apache-2.0.txt | 202 +++++++++++++++++++ .../config/benchmark-put-indexed-val.properties | 64 ++++++ modules/yardstick/config/ignite-base-config.xml | 23 +++ .../cache/IgnitePutIndexedValue1Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue2Benchmark.java | 42 ++++ .../cache/IgnitePutIndexedValue8Benchmark.java | 42 ++++ .../ignite/yardstick/cache/model/Person1.java | 55 +++++ .../ignite/yardstick/cache/model/Person2.java | 67 ++++++ .../ignite/yardstick/cache/model/Person8.java | 109 ++++++++++ 16 files changed, 727 insertions(+), 8 deletions(-) ----------------------------------------------------------------------
