You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/02/25 13:31:08 UTC
[09/51] [abbrv] ignite git commit: Merge branch 'master' into
ignite-2523
Merge branch 'master' into ignite-2523
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3d34e50c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3d34e50c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3d34e50c
Branch: refs/heads/ignite-2523
Commit: 3d34e50c9ece0d12e35a0ff6130659cfa03bdddf
Parents: 3967130 10a2b7a
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Feb 4 10:44:33 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Feb 4 10:44:33 2016 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheAdapter.java | 100 ++++++++++++++++++-
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../cache/GridCacheUpdateAtomicResult.java | 4 +-
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +-
.../org/apache/ignite/spark/IgniteContext.scala | 11 +-
.../ignite/internal/GridFactorySelfTest.java | 2 +-
6 files changed, 110 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/3d34e50c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
----------------------------------------------------------------------