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/08/17 13:05:36 UTC

[15/15] incubator-ignite git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10606

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-gg-10606


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/ddbbffb0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/ddbbffb0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/ddbbffb0

Branch: refs/heads/ignite-gg-10606
Commit: ddbbffb079c714875e4caada19de2e6571436527
Parents: 15541d7 1f00c70
Author: iveselovskiy <iv...@gridgain.com>
Authored: Mon Aug 17 14:04:45 2015 +0300
Committer: iveselovskiy <iv...@gridgain.com>
Committed: Mon Aug 17 14:04:45 2015 +0300

----------------------------------------------------------------------
 .../CachePartialUpdateCheckedException.java     |  29 +-
 .../processors/cache/GridCacheAdapter.java      | 161 +++++-
 .../processors/cache/GridCacheMapEntry.java     |   4 +-
 .../dht/atomic/GridNearAtomicUpdateFuture.java  |  63 ++-
 .../near/GridNearOptimisticTxPrepareFuture.java |   2 +-
 .../ignite/internal/util/GridArgumentCheck.java |  17 +
 ...cheDhtLocalPartitionAfterRemoveSelfTest.java |  33 +-
 .../cache/GridCacheAbstractFullApiSelfTest.java |   1 -
 .../IgniteCacheSizeFailoverTest.java            | 115 ++++
 .../IgniteCachePutRetryAbstractSelfTest.java    | 120 +++-
 ...PutRetryAtomicPrimaryWriteOrderSelfTest.java |  32 ++
 .../tcp/IgniteCacheSslStartStopSelfTest.java    |   1 +
 .../IgniteCacheFailoverTestSuite.java           |   3 +
 .../testsuites/IgniteCacheTestSuite2.java       |   1 +
 modules/jms11/pom.xml                           |  98 ++++
 .../apache/ignite/stream/jms11/JmsStreamer.java | 524 ++++++++++++++++++
 .../ignite/stream/jms11/MessageTransformer.java |  43 ++
 .../stream/jms11/IgniteJmsStreamerTest.java     | 551 +++++++++++++++++++
 .../jms11/IgniteJmsStreamerTestSuite.java       |  34 ++
 .../ignite/stream/jms11/TestTransformers.java   | 123 +++++
 .../apache/ignite/logger/log4j/Log4JLogger.java |   4 +
 pom.xml                                         |   1 +
 22 files changed, 1890 insertions(+), 70 deletions(-)
----------------------------------------------------------------------