You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/20 11:27:55 UTC
[5/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-1109
Merge remote-tracking branch 'remotes/origin/master' into ignite-1109
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/018022f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/018022f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/018022f3
Branch: refs/heads/ignite-1109
Commit: 018022f396ab8a36004bcccaa958bbbc6c4dd10d
Parents: 80c114c 7ae2b0a
Author: ivasilinets <iv...@gridgain.com>
Authored: Mon Jul 20 12:26:58 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Mon Jul 20 12:26:58 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 2 +-
.../processors/cache/IgniteCacheProxy.java | 2 +-
.../processors/cache/IgniteInternalCache.java | 1 +
.../ignite/internal/util/IgniteUtils.java | 4 +-
.../IgniteCachePutRetryAbstractSelfTest.java | 52 +++++++++++++-------
...gniteCachePutRetryTransactionalSelfTest.java | 17 ++++---
6 files changed, 49 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/018022f3/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteInternalCache.java
----------------------------------------------------------------------