This is an automated email from the ASF dual-hosted git repository. sboikov pushed a commit to branch ignite-11704 in repository https://gitbox.apache.org/repos/asf/ignite.git
commit 8c9bd4f6f2b5f4ae4d669b0bb5a6fd3c3277f610 Merge: 2a0a0e0 e6a793b Author: sboikov <[email protected]> AuthorDate: Sun Jul 21 22:41:19 2019 +0300 Merge remote-tracking branch 'origin/ignite-11704' into ignite-11704 # Conflicts: # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/topology/GridDhtLocalPartition.java .../processors/cache/IgniteCacheOffheapManager.java | 2 ++ .../processors/cache/IgniteCacheOffheapManagerImpl.java | 13 +++++++++++++ 2 files changed, 15 insertions(+)
