Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6ed5c1c6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6ed5c1c6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6ed5c1c6 Branch: refs/heads/ignite-1076 Commit: 6ed5c1c694dbdf40840aaf7457f883959e8aa917 Parents: 96fa300 9d0aa6f Author: vozerov-gridgain <voze...@gridgain.com> Authored: Tue Jul 7 18:07:55 2015 +0300 Committer: vozerov-gridgain <voze...@gridgain.com> Committed: Tue Jul 7 18:07:55 2015 +0300 ---------------------------------------------------------------------- .../cache/eviction/fifo/FifoEvictionPolicy.java | 5 - .../cache/eviction/lru/LruEvictionPolicy.java | 5 - .../eviction/sorted/SortedEvictionPolicy.java | 19 +-- .../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 + 11 files changed, 217 insertions(+), 42 deletions(-) ----------------------------------------------------------------------
