Skip to content

Commit 6e70a01

Browse files
committed
Merge remote-tracking branch 'blessed/master' into multi_log
2 parents 757a65f + 31a334a commit 6e70a01

File tree

186 files changed

+2412
-1757
lines changed

Some content is hidden

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

186 files changed

+2412
-1757
lines changed

README.md

Lines changed: 5 additions & 2 deletions
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

@@ -47,18 +47,21 @@ Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com.
4747
You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
4848

4949
Upcoming meetups
50-
* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
5150
* [London Meetup](https://www.meetup.com/clickhouse-london-user-group/events/306047172/) - May 14, 2025
5251
* [Istanbul Meetup](https://www.meetup.com/clickhouse-turkiye-meetup-group/events/306978337/) - May 15, 2025
5352
* [Shenzhen Meetup](https://www.huodongxing.com/event/7803892350511) - May 17, 2025
53+
* [Belgium Meetup](https://www.meetup.com/clickhouse-belgium-user-group/events/307818346/) - May 20, 2025
5454
* [Seattle Meetup](https://www.meetup.com/clickhouse-seattle-user-group/events/307622716/) - May 20, 2025
5555
* [Tokyo Meetup](https://www.meetup.com/clickhouse-tokyo-user-group/events/307689645/) - June 5, 2025
56+
* [Cyprus Meetup](https://www.meetup.com/clickhouse-cyprus-user-group/events/307819236) - June 10, 2025
5657
* [Washington DC Meetup](https://www.meetup.com/clickhouse-dc-user-group/events/307622954/) - June 12, 2025
58+
* [Tel Aviv Meetup](https://www.meetup.com/clickhouse-meetup-israel/events/307820741/) - June 17, 2025
5759
* [Atlanta Meetup](https://www.meetup.com/clickhouse-atlanta-meetup-group/events/307627590/) - July 8, 2025
5860
* [New York Meetup](https://www.meetup.com/clickhouse-new-york-user-group/events/307627675/) - July 15, 2025
5961

6062

6163
Recent meetups
64+
* [Austin Meetup](https://www.meetup.com/clickhouse-austin-user-group/events/307289908) - May 13, 2025
6265
* [Denver Meetup](https://www.meetup.com/clickhouse-denver-user-group/events/306934991/) - April 23, 2025
6366
* [Jakarta Meetup with AWS](https://www.meetup.com/clickhouse-indonesia-user-group/events/306973747/) - April 22, 2025
6467
* [Kuala Lumper Meetup with CNCF](https://www.meetup.com/clickhouse-malaysia-meetup-group/events/306697678/) - April 16, 2025

base/poco/Foundation/src/URI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,7 +690,7 @@ void URI::encodePath(std::string & encodedStr) const
690690
if (_enable_url_encoding)
691691
encode(_path, RESERVED_PATH, encodedStr);
692692
else
693-
encodedStr = _path;
693+
encodedStr = encodedStr + _path;
694694
}
695695

696696
void URI::decodePath(const std::string & encodedStr)

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.

0 commit comments

Comments
 (0)