Merge branches 'ignite-591' and 'master' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-591
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5dc2d2bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5dc2d2bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5dc2d2bc Branch: refs/heads/ignite-1076 Commit: 5dc2d2bc41bf04d0b7c538dd1a37b3cbc67c45e6 Parents: e54f572 44506c3 Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Tue Jul 7 14:23:41 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Tue Jul 7 14:23:41 2015 +0300 ---------------------------------------------------------------------- modules/core/pom.xml | 4 +- .../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 ++ .../TcpDiscoveryNodeConsistentIdSelfTest.java | 80 +++++++++ .../ignite/testsuites/IgniteCacheTestSuite.java | 1 + .../IgniteSpiDiscoverySelfTestSuite.java | 2 + 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 + 20 files changed, 343 insertions(+), 49 deletions(-) ----------------------------------------------------------------------
