Skip to content

Commit fe187a3

Browse files
Merge branch 'fix-test-02479_race_condition_between_insert_and_droppin_mv' into stripe-log-use-new-serialization-formats
2 parents 9b3d187 + 6f10880 commit fe187a3

File tree

240 files changed

+5898
-3867
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+5898
-3867
lines changed

.github/ISSUE_TEMPLATE/85_bug-report.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ body:
3838
> Change "enabled" to true in "send_crash_reports" section in `config.xml`:
3939
```xml
4040
<send_crash_reports>
41-
<!-- Changing <enabled> to true allows sending crash reports to -->
42-
<!-- the ClickHouse core developers team via Sentry https://sentry.io -->
43-
<enabled>false</enabled>
41+
<!-- Changing <enabled> to true allows sending crash reports to -->
42+
<!-- the ClickHouse core developers team. -->
43+
<enabled>true</enabled>
4444
</send_crash_reports>
4545
```
4646
-----

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@
137137
[submodule "contrib/fmtlib"]
138138
path = contrib/fmtlib
139139
url = https://github.com/fmtlib/fmt
140-
[submodule "contrib/sentry-native"]
141-
path = contrib/sentry-native
142-
url = https://github.com/ClickHouse/sentry-native
143140
[submodule "contrib/krb5"]
144141
path = contrib/krb5
145142
url = https://github.com/ClickHouse/krb5

ci/defs/defs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class CIFiles:
103103
# ),
104104
Docker.Config(
105105
name="clickhouse/cctools",
106-
path="./docker/packager/cctools",
106+
path="./ci/docker/cctools",
107107
platforms=Docker.Platforms.arm_amd,
108108
depends_on=["clickhouse/fasttest"],
109109
),
File renamed without changes.

ci/docker/clickhouse-server/docker_related_config.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

ci/docker/clickhouse-server/entrypoint.sh

Lines changed: 0 additions & 222 deletions
This file was deleted.

ci/docker/clickhouse-server/from_binary/Dockerfile.ubuntu

Lines changed: 0 additions & 55 deletions
This file was deleted.

ci/docker/clickhouse-server/from_deb/Dockerfile.ubuntu

Lines changed: 0 additions & 58 deletions
This file was deleted.

ci/docker/fasttest/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ RUN apt-get update \
1414
apt-utils \
1515
ca-certificates \
1616
curl \
17+
netcat-openbsd \
1718
gnupg \
1819
lsb-release \
1920
wget \

0 commit comments

Comments
 (0)