Merge remote-tracking branch 'remotes/origin/master' into ignite-961-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/dd9999d9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dd9999d9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dd9999d9 Branch: refs/heads/ignite-961 Commit: dd9999d9d0da7bdbe241789dd425ce5f662245ac Parents: 268f30a f62744e Author: ivasilinets <ivasilin...@gridgain.com> Authored: Mon Jul 20 22:41:11 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Mon Jul 20 22:41:11 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 2 +- .../processors/cache/IgniteCacheProxy.java | 2 +- .../processors/cache/IgniteInternalCache.java | 1 + .../distributed/dht/GridDhtTxPrepareFuture.java | 9 ++-- .../ignite/internal/util/IgniteUtils.java | 4 +- .../IgniteClientReconnectFailoverTest.java | 6 +++ .../cache/CacheAffinityCallSelfTest.java | 14 ++++-- .../IgniteCachePutRetryAbstractSelfTest.java | 52 +++++++++++++------- ...gniteCachePutRetryTransactionalSelfTest.java | 17 ++++--- ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- pom.xml | 12 ++--- 11 files changed, 78 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dd9999d9/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ----------------------------------------------------------------------
