You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/09/22 07:53:59 UTC
[2/2] ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-1.4' into ignite-1516-1
Merge remote-tracking branch 'remotes/origin/ignite-1.4' into ignite-1516-1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5de81d89
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5de81d89
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5de81d89
Branch: refs/heads/ignite-1516-1
Commit: 5de81d89b9c10af2195befaed3cb7a8a5f5099e9
Parents: 081de48 621eb0f
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 22 08:53:36 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 22 08:53:36 2015 +0300
----------------------------------------------------------------------
.../processors/cache/GridCacheMapEntry.java | 37 +++++++++++++-------
.../processors/cache/GridCacheProcessor.java | 2 +-
.../processors/cache/GridCacheSwapManager.java | 24 ++++++-------
.../datastreamer/DataStreamerImpl.java | 2 --
4 files changed, 37 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5de81d89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5de81d89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5de81d89/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java
----------------------------------------------------------------------