Merge branch 'ignite-3477-master' of https://github.com/gridgain/apache-ignite into ignite-3477-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/54213d63 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/54213d63 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/54213d63 Branch: refs/heads/ignite-3477-master Commit: 54213d637b2f547856b736735b692ac672a023de Parents: c56c4b8 f59a7f6 Author: Alexey Goncharuk <[email protected]> Authored: Mon Apr 10 18:08:47 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Mon Apr 10 18:08:47 2017 +0300 ---------------------------------------------------------------------- .../cache/IgniteCacheOffheapManagerImpl.java | 45 +++++++++++--------- .../near/GridCacheNearReadersSelfTest.java | 6 ++- 2 files changed, 31 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/54213d63/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/54213d63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/GridCacheNearReadersSelfTest.java ----------------------------------------------------------------------
