[ignite] 02/02: fix merge conflicts

2021-07-19 Thread tledkov
This is an automated email from the ASF dual-hosted git repository. tledkov pushed a commit to branch sql-calcite in repository https://gitbox.apache.org/repos/asf/ignite.git commit ea6c392628d9b99f7f5319d4cc11d12f1e62f2a4 Author: tledkov AuthorDate: Mon Jul 19 12:14:28 2021 +0300 fix

[ignite] 02/02: fix merge conflicts

2020-09-14 Thread gvvinblade
This is an automated email from the ASF dual-hosted git repository. gvvinblade pushed a commit to branch ignite-12248 in repository https://gitbox.apache.org/repos/asf/ignite.git commit 25e754c2d51e03aafc063755b6cf44d097e9d7f3 Author: Igor Seliverstov AuthorDate: Mon Sep 14 14:09:18 2020 +0300