Merge pull request #24144 from oxidecomputer/master

Update submodules for building on illumos
ClickHouse · May 15, 2021 · 32a9677 · 32a9677
2 parents e785029 + 3252228
commit 32a9677
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 6 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -17,6 +17,7 @@
 [submodule "contrib/zlib-ng"]
 	path = contrib/zlib-ng
 	url = https://github.com/ClickHouse-Extras/zlib-ng.git
+	branch = clickhouse-new
 [submodule "contrib/googletest"]
 	path = contrib/googletest
 	url = https://github.com/google/googletest.git

diff --git a/contrib/boringssl b/contrib/boringssl
diff --git a/contrib/cppkafka b/contrib/cppkafka
diff --git a/contrib/grpc b/contrib/grpc
diff --git a/contrib/poco b/contrib/poco
diff --git a/contrib/rocksdb b/contrib/rocksdb
diff --git a/contrib/zlib-ng b/contrib/zlib-ng
+2 −2		.travis.yml
+6 −2		cmake/FindRdKafka.cmake
+10 −4		include/cppkafka/CMakeLists.txt
+1 −1		include/cppkafka/detail/endianness.h
+0 −1		include/cppkafka/message_timestamp.h
+4 −3		include/cppkafka/producer.h
+0 −1		include/cppkafka/queue.h
+0 −1		include/cppkafka/topic.h
+51 −12		include/cppkafka/utils/buffered_producer.h
+1 −1		tests/CMakeLists.txt