Skip to content

Commit 4cb1e92

Browse files
authored
Merge branch 'ClickHouse:main' into mcp_docs
2 parents 6d5dba6 + 63e69d3 commit 4cb1e92

File tree

10 files changed

+420
-9
lines changed

10 files changed

+420
-9
lines changed

docs/cloud/changelogs/24_02.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: 'v24.2 Changelog'
44
description: 'Fast release changelog for v24.2'
55
keywords: ['changelog']
66
sidebar_label: '24.2'
7-
sidebar_position: 7
7+
sidebar_position: 8
88
---
99

1010
### ClickHouse release tag: 24.2.2.15987 {#clickhouse-release-tag-242215987}

docs/cloud/changelogs/24_05.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: 'v24.5 Changelog for Cloud'
44
description: 'Fast release changelog for v24.5'
55
keywords: ['changelog', 'cloud']
66
sidebar_label: '24.5'
7-
sidebar_position: 6
7+
sidebar_position: 7
88
---
99

1010
# v24.5 Changelog for Cloud

docs/cloud/changelogs/24_06.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: 'v24.6 Changelog for Cloud'
44
description: 'Fast release changelog for v24.6'
55
keywords: ['changelog', 'cloud']
66
sidebar_label: '24.6'
7-
sidebar_position: 5
7+
sidebar_position: 6
88
---
99

1010
# v24.6 Changelog for Cloud

docs/cloud/changelogs/24_08.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: 'v24.8 Changelog for Cloud'
44
description: 'Fast release changelog for v24.8'
55
keywords: ['changelog', 'cloud']
66
sidebar_label: '24.8'
7-
sidebar_position: 4
7+
sidebar_position: 5
88
---
99

1010
Relevant changes for ClickHouse Cloud services based on the v24.8 release.

docs/cloud/changelogs/24_10.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: 'v24.10 Changelog for Cloud'
44
description: 'Fast release changelog for v24.10'
55
keywords: ['changelog', 'cloud']
66
sidebar_label: '24.10'
7-
sidebar_position: 3
7+
sidebar_position: 4
88
---
99

1010
Relevant changes for ClickHouse Cloud services based on the v24.10 release.

docs/cloud/changelogs/24_12.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: 'v24.12 Changelog for Cloud'
44
description: 'Fast release changelog for v24.12'
55
keywords: ['changelog', 'cloud']
66
sidebar_label: '24.12'
7-
sidebar_position: 2
7+
sidebar_position: 3
88
---
99

1010
Relevant changes for ClickHouse Cloud services based on the v24.12 release.

docs/cloud/changelogs/25_04.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ title: 'v25.4 Changelog for Cloud'
44
description: 'Fast release changelog for v25.4'
55
keywords: ['changelog', 'cloud']
66
sidebar_label: '25.4'
7-
sidebar_position: 1
7+
sidebar_position: 2
88
---
99

1010
## Backward Incompatible Changes {#backward-incompatible-changes}

docs/cloud/changelogs/25_06.md

Lines changed: 395 additions & 0 deletions
Large diffs are not rendered by default.

placeholderReset.sh

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@ echo "Copying placeholder files over generated content"
33
PLACEHOLDER=docs/_placeholders
44
DOCS=docs
55

6-
cp $PLACEHOLDER/changelog/_index.md $DOCS/whats-new/changelog/index.md
6+
FOLDERS_TO_REMOVE="docs/development docs/engines docs/interfaces docs/operations docs/sql-reference"
7+
IFS=' ' read -ra FOLDER_ARRAY <<< "$FOLDERS_TO_REMOVE"
8+
9+
echo "Removing ClickHouse/ClickHouse repository folders..."
10+
11+
# Loop through each folder and remove it
12+
for folder in "${FOLDER_ARRAY[@]}"; do
13+
if [ -d "$folder" ]; then
14+
echo "Removing directory: $folder"
15+
rm -rf "$folder"
16+
echo "✓ Removed: $folder"
17+
else
18+
echo "⚠ Directory not found: $folder"
19+
fi
20+
done
21+
22+
cp $PLACEHOLDER/changelog/_index.md $DOCS/whats-new/changelog/index.md
723
echo "Copying completed"
824
echo "----END----"

scripts/settings/experimental-settings.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ WITH
1111
format('[{}](/operations/settings/settings#{})', name, name) AS Name,
1212
format('`{}`', default) AS Default
1313
FROM system.settings
14-
WHERE tier = 'Experimental' AND alias_for=''
14+
WHERE tier = 'Experimental' AND alias_for='' AND name NOT LIKE 'allow_experimental_inverted_index'
1515
),
1616
experimental_mergetree_settings AS
1717
(

0 commit comments

Comments
 (0)