You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/09/05 12:00:04 UTC
[2/2] ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-3478
Merge remote-tracking branch 'remotes/origin/master' into ignite-3478
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a82c68d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a82c68d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a82c68d
Branch: refs/heads/ignite-3478
Commit: 5a82c68dcd1927bb6fded8b7def38c91ff6e145b
Parents: e1e07ff dab2785
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 5 14:59:49 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 5 14:59:49 2017 +0300
----------------------------------------------------------------------
.../processors/cache/IgniteCacheOffheapManagerImpl.java | 2 +-
.../internal/processors/cache/tree/AbstractDataInnerIO.java | 8 ++++----
.../internal/processors/cache/tree/AbstractDataLeafIO.java | 8 ++++----
.../processors/cache/tree/AbstractPendingEntryInnerIO.java | 8 ++++----
.../processors/cache/tree/AbstractPendingEntryLeafIO.java | 8 ++++----
.../internal/processors/cache/tree/CacheDataRowStore.java | 6 +++---
.../ignite/internal/processors/cache/tree/CacheDataTree.java | 3 ++-
.../processors/cache/tree/CacheIdAwareDataInnerIO.java | 4 ++--
.../processors/cache/tree/CacheIdAwareDataLeafIO.java | 4 ++--
.../cache/tree/CacheIdAwarePendingEntryInnerIO.java | 4 ++--
.../cache/tree/CacheIdAwarePendingEntryLeafIO.java | 4 ++--
.../ignite/internal/processors/cache/tree/DataInnerIO.java | 8 ++++----
.../ignite/internal/processors/cache/tree/DataLeafIO.java | 8 ++++----
.../ignite/internal/processors/cache/tree/DataRow.java | 1 +
.../internal/processors/cache/tree/PendingEntriesTree.java | 6 +++---
.../internal/processors/cache/tree/PendingEntryInnerIO.java | 8 ++++----
.../internal/processors/cache/tree/PendingEntryLeafIO.java | 8 ++++----
.../java/org/apache/ignite/internal/util/lang/GridFunc.java | 1 +
18 files changed, 51 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5a82c68d/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
----------------------------------------------------------------------