Merge branches 'ignite-3477-master' and 'ignite-4535-master' of https://github.com/gridgain/apache-ignite into ignite-4535-master
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/55b13c6b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/55b13c6b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/55b13c6b Branch: refs/heads/ignite-3477-master Commit: 55b13c6be2c8d31c1800931417e900dd4079f9a4 Parents: be28dbf 481f021 Author: Ilya Lantukh <[email protected]> Authored: Mon Apr 3 15:09:06 2017 +0300 Committer: Ilya Lantukh <[email protected]> Committed: Mon Apr 3 15:09:06 2017 +0300 ---------------------------------------------------------------------- .../cache/IgniteCacheOffheapManagerImpl.java | 20 +++++--------------- .../cache/query/IndexingSpiQuerySelfTest.java | 3 --- 2 files changed, 5 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/55b13c6b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java ----------------------------------------------------------------------
