tree c48b528dec23d298001739d226ec27521eb562e9
parent 6b6c0f198851fb977f6fc499c82fbcb74cf43928
parent 40f1fc94c4c8755e36cc55dd9f8124cc76d7b5f1
author Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com> 1547155311 +0300
committer Dmitriy Govorukhin <dmitriy.govorukhin@gmail.com> 1547155311 +0300

Merge branch 'master' into ignite-10809-dg

# Conflicts:
#	modules/core/src/main/java/org/apache/ignite/internal/processors/cache/WalStateManager.java