Merge branch 'master' into ignite-648
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/83f48959 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/83f48959 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/83f48959 Branch: refs/heads/ignite-648-failover Commit: 83f48959ae22eefa27788a3f981cca17025a4f5e Parents: b38f04f 9d0aa6f Author: ashutak <ashu...@gridgain.com> Authored: Tue Jul 7 16:24:59 2015 +0300 Committer: ashutak <ashu...@gridgain.com> Committed: Tue Jul 7 16:24:59 2015 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 4 +- .../cache/eviction/fifo/FifoEvictionPolicy.java | 5 - .../cache/eviction/lru/LruEvictionPolicy.java | 5 - .../eviction/sorted/SortedEvictionPolicy.java | 19 +- .../internal/interop/InteropIgnition.java | 31 +- .../processors/cache/CacheObjectImpl.java | 1 - .../dht/GridPartitionedGetFuture.java | 13 +- .../ignite/internal/util/IgniteUtils.java | 6 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 26 ++ .../cache/CacheFutureExceptionSelfTest.java | 171 +++++++++ .../GridCachePartitionedNodeRestartTest.java | 5 - ...ePartitionedOptimisticTxNodeRestartTest.java | 2 +- .../GridCacheReplicatedFailoverSelfTest.java | 5 - .../GridCacheReplicatedNodeRestartSelfTest.java | 5 - ...acheAtomicReplicatedNodeRestartSelfTest.java | 10 + ...heConcurrentEvictionConsistencySelfTest.java | 15 +- .../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 ++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java | 2 + modules/kafka/pom.xml | 116 ++++++ .../ignite/stream/kafka/KafkaStreamer.java | 220 +++++++++++ .../kafka/IgniteKafkaStreamerSelfTestSuite.java | 37 ++ .../stream/kafka/KafkaEmbeddedBroker.java | 378 +++++++++++++++++++ .../kafka/KafkaIgniteStreamerSelfTest.java | 227 +++++++++++ .../ignite/stream/kafka/SimplePartitioner.java | 53 +++ modules/mesos/pom.xml | 1 - modules/rest-http/pom.xml | 14 +- modules/urideploy/pom.xml | 8 +- modules/web/pom.xml | 6 +- parent/pom.xml | 1 + pom.xml | 1 + 31 files changed, 1393 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/83f48959/modules/core/pom.xml ----------------------------------------------------------------------
