Merge branches 'ignite-143' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-futures-cleanup-1
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/86cf5e3c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/86cf5e3c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/86cf5e3c Branch: refs/heads/ignite-51 Commit: 86cf5e3ca7be2d830a1aa575e8af7b9f5d7adcd2 Parents: c3b1493 7440aba Author: Yakov Zhdanov <yzhda...@gridgain.com> Authored: Thu Mar 5 17:24:33 2015 +0300 Committer: Yakov Zhdanov <yzhda...@gridgain.com> Committed: Thu Mar 5 17:24:33 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/near/GridNearCacheAdapter.java | 8 ++++++++ .../processors/cache/GridCacheConcurrentMapTest.java | 4 +--- 2 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/86cf5e3c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearCacheAdapter.java ----------------------------------------------------------------------
