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/07/07 16:56:17 UTC

[7/7] incubator-ignite git commit: Merge remote-tracking branch 'remotes/origin/master' into ignite-901

Merge remote-tracking branch 'remotes/origin/master' into ignite-901


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

Branch: refs/heads/ignite-901
Commit: e3dd331378e634f94dd9516539981739765df175
Parents: 89fb395 9d0aa6f
Author: sboikov <sb...@gridgain.com>
Authored: Tue Jul 7 17:55:32 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Jul 7 17:55:32 2015 +0300

----------------------------------------------------------------------
 .../cache/eviction/fifo/FifoEvictionPolicy.java |   5 -
 .../cache/eviction/lru/LruEvictionPolicy.java   |   5 -
 .../eviction/sorted/SortedEvictionPolicy.java   |  19 +--
 .../processors/cache/CacheObjectImpl.java       |   1 -
 .../dht/GridPartitionedGetFuture.java           |  13 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |  26 +++
 .../cache/CacheFutureExceptionSelfTest.java     | 171 +++++++++++++++++++
 .../GridCachePartitionedNodeRestartTest.java    |   5 -
 ...ePartitionedOptimisticTxNodeRestartTest.java |   2 +-
 .../GridCacheReplicatedFailoverSelfTest.java    |   5 -
 .../GridCacheReplicatedNodeRestartSelfTest.java |   5 -
 ...heConcurrentEvictionConsistencySelfTest.java |  15 +-
 .../ignite/testsuites/IgniteCacheTestSuite.java |   1 +
 13 files changed, 227 insertions(+), 46 deletions(-)
----------------------------------------------------------------------