tree d586d2aedd2dbf9fa93cec59bdf6554db78af7b8
parent 7bee9a249e4a2e8e962c3258ee882119e150363b
parent ee172d2604dfc393b5516c78cdd328a1db08847e
author Dmitriy Pavlov <dpavlov@apache.org> 1552652557 +0300
committer Dmitriy Pavlov <dpavlov@apache.org> 1552652557 +0300

Merge branch 'master' into ignite-11464-modules-indexing

# Conflicts:
#	modules/dev-utils/ignite-modules-test/src/test/java/module-info.java
#	modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java