Skip to content

Commit baf58be

Browse files
Merge branch 'master' into 25_5_changelog
2 parents f17c73b + 1b7dc9c commit baf58be

File tree

334 files changed

+7168
-4678
lines changed

Some content is hidden

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

334 files changed

+7168
-4678
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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ curl https://clickhouse.com/ | sh
3737
Every month we get together with the community (users, contributors, customers, those interested in learning more about ClickHouse) to discuss what is coming in the latest release.
3838
If you are interested in sharing what you've built on ClickHouse, let us know.
3939

40-
* [v25.4 Community & Release Call](https://clickhouse.com/company/events/v25-4-community-release-call) - April 22
40+
* [v25.5 Community & Release Call](https://clickhouse.com/company/events/v25-5-community-release-call) - May 22
4141

4242
## Upcoming Events
4343

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)