You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/01 08:47:27 UTC
[13/14] ignite git commit: Merge branch 'master' into ignite-2502
Merge branch 'master' into ignite-2502
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/cc2dc4f1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/cc2dc4f1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/cc2dc4f1
Branch: refs/heads/ignite-2502
Commit: cc2dc4f1fa3c5069fdafd8920a30bdd61886f450
Parents: bc28562 5500a18
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Feb 1 10:44:02 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Feb 1 10:44:02 2016 +0300
----------------------------------------------------------------------
.../org/apache/ignite/internal/IgnitionEx.java | 4 +-
.../processors/cache/CacheOperationContext.java | 43 ++-
.../processors/cache/GridCacheAdapter.java | 8 +-
.../processors/cache/GridCacheProxyImpl.java | 11 +-
.../processors/cache/IgniteCacheProxy.java | 43 ++-
.../dht/atomic/GridDhtAtomicCache.java | 108 ++++--
.../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +-
.../dht/preloader/GridDhtPartitionDemander.java | 4 +-
.../processors/cache/dr/GridCacheDrInfo.java | 49 ++-
.../transactions/IgniteTxLocalAdapter.java | 81 ++--
.../cache/version/GridCacheVersionManager.java | 23 +-
.../GridCacheRebalancingSyncSelfTest.java | 8 +
.../testframework/junits/GridAbstractTest.java | 3 +
modules/kafka/README.txt | 111 +++++-
modules/kafka/pom.xml | 69 ++--
.../ignite/stream/kafka/KafkaStreamer.java | 2 +-
.../kafka/connect/IgniteSinkConnector.java | 91 +++++
.../kafka/connect/IgniteSinkConstants.java | 38 ++
.../stream/kafka/connect/IgniteSinkTask.java | 165 ++++++++
.../kafka/IgniteKafkaStreamerSelfTestSuite.java | 9 +-
.../stream/kafka/KafkaEmbeddedBroker.java | 387 -------------------
.../kafka/KafkaIgniteStreamerSelfTest.java | 13 +-
.../ignite/stream/kafka/SimplePartitioner.java | 53 ---
.../ignite/stream/kafka/TestKafkaBroker.java | 237 ++++++++++++
.../kafka/connect/IgniteSinkConnectorTest.java | 250 ++++++++++++
.../kafka/src/test/resources/example-ignite.xml | 71 ++++
.../commands/top/VisorTopologyCommand.scala | 5 +-
.../apache/ignite/yarn/ApplicationMaster.java | 12 +-
.../apache/ignite/yarn/ClusterProperties.java | 144 ++++---
.../yarn/IgniteApplicationMasterSelfTest.java | 52 +++
parent/pom.xml | 120 +++---
pom.xml | 16 -
32 files changed, 1521 insertions(+), 713 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/cc2dc4f1/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
----------------------------------------------------------------------