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 2015/11/27 09:45:54 UTC

[4/4] ignite git commit: Merge branch 'ignite-1.5' into ignite-1956

Merge branch 'ignite-1.5' into ignite-1956


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/00eb4d85
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/00eb4d85
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/00eb4d85

Branch: refs/heads/ignite-1956
Commit: 00eb4d85c87c468247650c91cf3125463301b1e6
Parents: 9ca8974 e9f22ab
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Fri Nov 27 11:46:36 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Fri Nov 27 11:46:36 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/GridCacheAdapter.java      | 67 +++++---------------
 .../cache/GridCacheConcurrentMap.java           | 52 +++++----------
 .../distributed/dht/GridNoStorageCacheMap.java  |  4 +-
 .../distributed/near/GridNearCacheAdapter.java  |  4 +-
 .../IgniteClientReconnectCacheTest.java         | 26 +++++---
 .../cache/GridCacheConcurrentMapSelfTest.java   |  2 +-
 6 files changed, 53 insertions(+), 102 deletions(-)
----------------------------------------------------------------------