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 2019/04/03 07:02:57 UTC

[ignite] 03/03: Merge remote-tracking branch 'origin/ignite-9720' into ignite-9720

This is an automated email from the ASF dual-hosted git repository.

sboikov pushed a commit to branch ignite-9720
in repository https://gitbox.apache.org/repos/asf/ignite.git

commit 55a6b2e1810d2f8cda504a208896ce989b8f7411
Merge: d429160 36ecd74
Author: sboikov <sb...@apache.org>
AuthorDate: Wed Apr 3 10:01:42 2019 +0300

    Merge remote-tracking branch 'origin/ignite-9720' into ignite-9720
    
    # Conflicts:
    #	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/LazyCacheFreeList.java

 .../processors/cache/persistence/GridCacheOffheapManager.java    | 2 ++
 .../internal/processors/cache/persistence/LazyCacheFreeList.java | 9 +++++++--
 .../continuous/CacheContinuousQueryFailoverAbstractSelfTest.java | 4 ++--
 3 files changed, 11 insertions(+), 4 deletions(-)