From 3d3c25b52df440d00ad665494befed389c1f08d9 Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Fri, 31 Jul 2020 00:38:17 +0300 Subject: [PATCH] Switch cppkafka to upstream and bump to upstream/master All changes in ClickHouse-Extra has been merged into upstream no need in using the fork. There are not a lot of changes for now, and cppkafka does not looks like in the active development stage, but just in case better to sync with upstream. FWIW cppkafka usage is pretty minimal and it's usage is questionable, since librdkafka is under active development while cppkafka is not, and later still does not support some features that is used in clickhouse: - interceptors (for logging proxying) --- .gitmodules | 2 +- contrib/cppkafka | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 32ce4983bb0..23a93ea6652 100644 --- a/.gitmodules +++ b/.gitmodules @@ -76,7 +76,7 @@ url = https://github.com/google/snappy [submodule "contrib/cppkafka"] path = contrib/cppkafka - url = https://github.com/ClickHouse-Extras/cppkafka.git + url = https://github.com/mfontanini/cppkafka.git [submodule "contrib/brotli"] path = contrib/brotli url = https://github.com/google/brotli.git diff --git a/contrib/cppkafka b/contrib/cppkafka index f555ee36aaa..b06e64ef5bf 160000 --- a/contrib/cppkafka +++ b/contrib/cppkafka @@ -1 +1 @@ -Subproject commit f555ee36aaa74d17ca0dab3ce472070a610b2966 +Subproject commit b06e64ef5bffd636d918a742c689f69130c1dbab