Skip to content

Commit 9b7ef37

Browse files
Merge pull request ClickHouse#86118 from ClickHouse/bump_version_25.9.1.1
Update version after release
2 parents ee5a709 + 8b99549 commit 9b7ef37

File tree

6 files changed

+141
-24
lines changed

6 files changed

+141
-24
lines changed

cmake/autogenerated_versions.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
# NOTE: VERSION_REVISION has nothing common with DBMS_TCP_PROTOCOL_VERSION,
44
# only DBMS_TCP_PROTOCOL_VERSION should be incremented on protocol changes.
5-
SET(VERSION_REVISION 54501)
5+
SET(VERSION_REVISION 54502)
66
SET(VERSION_MAJOR 25)
7-
SET(VERSION_MINOR 8)
7+
SET(VERSION_MINOR 9)
88
SET(VERSION_PATCH 1)
9-
SET(VERSION_GITHASH d4d4c9f77fa0796ad566398ef022b9a50f9779d5)
10-
SET(VERSION_DESCRIBE v25.8.1.1-testing)
11-
SET(VERSION_STRING 25.8.1.1)
9+
SET(VERSION_GITHASH 524fe1daa94ee496172cea813410300c3f45641e)
10+
SET(VERSION_DESCRIBE v25.9.1.1-testing)
11+
SET(VERSION_STRING 25.9.1.1)
1212
# end of autochange

src/Core/SettingsChangesHistory.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ const VersionToSettingsChangesMap & getSettingsChangesHistory()
3939
/// controls new feature and it's 'true' by default, use 'false' as previous_value).
4040
/// It's used to implement `compatibility` setting (see https://github.com/ClickHouse/ClickHouse/issues/35972)
4141
/// Note: please check if the key already exists to prevent duplicate entries.
42+
addSettingsChanges(settings_changes_history, "25.9",
43+
{
44+
45+
});
4246
addSettingsChanges(settings_changes_history, "25.8",
4347
{
4448
{"output_format_json_quote_64bit_integers", true, false, "Disable quoting of the 64 bit integers in JSON by default"},
@@ -846,6 +850,10 @@ const VersionToSettingsChangesMap & getMergeTreeSettingsChangesHistory()
846850
static std::once_flag initialized_flag;
847851
std::call_once(initialized_flag, [&]
848852
{
853+
addSettingsChanges(merge_tree_settings_changes_history, "25.9",
854+
{
855+
856+
});
849857
addSettingsChanges(merge_tree_settings_changes_history, "25.8",
850858
{
851859
{"object_serialization_version", "v2", "v2", "Add a setting to control JSON serialization versions"},

src/Storages/System/StorageSystemContributors.generated.cpp

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ const char * auto_contributors[] {
9595
"Alexandra Latysheva",
9696
"Alexandre Snarskii",
9797
"Alexei Averchenko",
98+
"Alexei Fedotov",
9899
"Alexey",
99100
"Alexey Arno",
100101
"Alexey Boykov",
@@ -275,11 +276,13 @@ const char * auto_contributors[] {
275276
"Brian Hunter",
276277
"Brokenice0415",
277278
"Bulat Gaifullin",
279+
"Bulat Sharipov",
278280
"Caio Ricciuti",
279281
"Camden Cheek",
280282
"Camilo Sierra",
281283
"Carbyn",
282284
"Carlos Rodríguez Hernández",
285+
"Casey Leask",
283286
"Caspian",
284287
"Chandre Van Der Westhuizen",
285288
"Chang Chen",
@@ -294,6 +297,7 @@ const char * auto_contributors[] {
294297
"Cheng Pan",
295298
"Cheryl Tuquib",
296299
"Chienlung Cheung",
300+
"Chris Crane",
297301
"Christian",
298302
"Christian Clauss",
299303
"Christoph Wurm",
@@ -321,6 +325,7 @@ const char * auto_contributors[] {
321325
"Damian Kula",
322326
"Damian Maslanka",
323327
"DamianMaslanka5",
328+
"Dan Checkoway",
324329
"Dan Roscigno",
325330
"Dan Wu",
326331
"DanRoscigno",
@@ -357,6 +362,7 @@ const char * auto_contributors[] {
357362
"Denis Krivak",
358363
"Denis Zhuravlev",
359364
"Denny Crane",
365+
"Denny [DBA at Innervate]",
360366
"Denys Golotiuk",
361367
"Derek Chia",
362368
"Derek Perkins",
@@ -434,6 +440,7 @@ const char * auto_contributors[] {
434440
"Eugene Klimov",
435441
"Eugene Konkov",
436442
"Evgenia Sudarikova",
443+
"Evgenii Leko",
437444
"Evgenii Pravda",
438445
"Evgeniia Sudarikova",
439446
"Evgeniy Gatov",
@@ -458,6 +465,7 @@ const char * auto_contributors[] {
458465
"Federico Ceratto",
459466
"Federico Rodriguez",
460467
"FeehanG",
468+
"Felix Mueller",
461469
"Fellipe Fernandes",
462470
"Feng Kaiyu",
463471
"Fern",
@@ -551,6 +559,7 @@ const char * auto_contributors[] {
551559
"Hosun Lee",
552560
"HowePa",
553561
"HuFuwang",
562+
"Huanlin Xiao",
554563
"Hui Wang",
555564
"HumanUser",
556565
"Hung Duong",
@@ -709,6 +718,7 @@ const char * auto_contributors[] {
709718
"Koblikov Mihail",
710719
"KochetovNicolai",
711720
"Konstantin Bogdanov",
721+
"Konstantin Dorichev",
712722
"Konstantin Grabar",
713723
"Konstantin Ilchenko",
714724
"Konstantin Lebedev",
@@ -779,6 +789,7 @@ const char * auto_contributors[] {
779789
"Luis Bosque",
780790
"Luke Gannon",
781791
"Lv Feng",
792+
"László Várady",
782793
"Léo Ercolanelli",
783794
"M0r64n",
784795
"M1eyu2018",
@@ -821,6 +832,7 @@ const char * auto_contributors[] {
821832
"Marta Paes",
822833
"Marti Raudsepp",
823834
"Martijn Bakker",
835+
"Maruth Goyal",
824836
"Marvin Taschenberger",
825837
"Masha",
826838
"Mathieu Rey",
@@ -939,6 +951,7 @@ const char * auto_contributors[] {
939951
"Neeke Gao",
940952
"Neng Liu",
941953
"NengLiu",
954+
"Nick",
942955
"Nick-71",
943956
"Nickita",
944957
"Nickita Taranov",
@@ -1075,6 +1088,7 @@ const char * auto_contributors[] {
10751088
"Rafael Acevedo",
10761089
"Rafael David Tinoco",
10771090
"Rafael Roquetto",
1091+
"Rajakavitha Kodhandapani",
10781092
"Rajkumar",
10791093
"Rajkumar Varada",
10801094
"Ramazan Polat",
@@ -1088,10 +1102,12 @@ const char * auto_contributors[] {
10881102
"RegulusZ",
10891103
"Reilee",
10901104
"Reinaldy Rafli",
1105+
"Renat Bilalov",
10911106
"Reto Kromer",
10921107
"Ri",
10931108
"Rich Raposa",
10941109
"RinChanNOWWW",
1110+
"Rishabh Bhardwaj",
10951111
"Robert Coelho",
10961112
"Robert Hodges",
10971113
"Robert Schulze",
@@ -1123,6 +1139,7 @@ const char * auto_contributors[] {
11231139
"Rory Crispin",
11241140
"Roy Bellingan",
11251141
"Roy Kim",
1142+
"RuS2m",
11261143
"Ruihang Xia",
11271144
"Ruslan",
11281145
"Ruslan Mardugalliamov",
@@ -1139,9 +1156,11 @@ const char * auto_contributors[] {
11391156
"Sachin Singh",
11401157
"SadiHassan",
11411158
"Safronov Michail",
1159+
"Sahith Vibudhi",
11421160
"Saif Ullah",
11431161
"SaltTan",
11441162
"Salvatore Mesoraca",
1163+
"Sam Radovich",
11451164
"Samay Sharma",
11461165
"Sameer Tamsekar",
11471166
"Sami Kerola",
@@ -1202,6 +1221,7 @@ const char * auto_contributors[] {
12021221
"Shanfeng Pang",
12031222
"Shani Elharrar",
12041223
"Shankar Iyer",
1224+
"Shaohua Wang",
12051225
"Sharath K S",
12061226
"Shaun Struwig",
12071227
"Sherry Wang",
@@ -1229,6 +1249,7 @@ const char * auto_contributors[] {
12291249
"SmitaRKulkarni",
12301250
"Snow",
12311251
"Sofia Antipushina",
1252+
"Somrat Dutta",
12321253
"Song Liyong",
12331254
"Sorck",
12341255
"Srikanth Chekuri",
@@ -1241,6 +1262,7 @@ const char * auto_contributors[] {
12411262
"Stepan",
12421263
"Stepan Herold",
12431264
"Stephan",
1265+
"Stephen Chi",
12441266
"Steve-金勇",
12451267
"StianBerger",
12461268
"Stig Bakken",
@@ -1293,6 +1315,7 @@ const char * auto_contributors[] {
12931315
"Tobias Lins",
12941316
"Todd Yocum",
12951317
"Tom Bombadil",
1318+
"Tom Quist",
12961319
"Tom Risse",
12971320
"Tomas Barton",
12981321
"Tomer Shafir",
@@ -1381,6 +1404,7 @@ const char * auto_contributors[] {
13811404
"Vladimir Valerianov",
13821405
"Vladimir Varankin",
13831406
"Vladimir Zhirov",
1407+
"Vladislav Gnezdilov",
13841408
"Vladislav Rassokhin",
13851409
"Vladislav Smirnov",
13861410
"Vladislav V",
@@ -1389,6 +1413,7 @@ const char * auto_contributors[] {
13891413
"Volodya Giro",
13901414
"Volodyachan",
13911415
"Volodymyr Kuznetsov",
1416+
"Vrishab V Srivatsa",
13921417
"Vsevolod Orlov",
13931418
"Vxider",
13941419
"Vyacheslav Alipov",
@@ -1440,6 +1465,7 @@ const char * auto_contributors[] {
14401465
"Your Name",
14411466
"Yu, Peng",
14421467
"Yuko Takagi",
1468+
"Yunchi Pang",
14431469
"Yuntao Wu",
14441470
"Yuri Dyachenko",
14451471
"Yurii Vlasenko",
@@ -1454,6 +1480,7 @@ const char * auto_contributors[] {
14541480
"Yutong Xiao",
14551481
"Z.H.",
14561482
"Zach Naimon",
1483+
"Zakhar Kravchuk",
14571484
"Zawa-II",
14581485
"Zawa_ll",
14591486
"Zaynulla",
@@ -1472,6 +1499,7 @@ const char * auto_contributors[] {
14721499
"Ziy1-Tan",
14731500
"Zoe Steinkamp",
14741501
"Zoran Pandovski",
1502+
"Zypperia",
14751503
"[데이터플랫폼팀] 이호선",
14761504
"a.palagashvili",
14771505
"aaapetrenko",
@@ -1483,11 +1511,13 @@ const char * auto_contributors[] {
14831511
"abyss7",
14841512
"achimbab",
14851513
"achulkov2",
1514+
"ackingliu",
14861515
"adevyatova",
14871516
"ageraab",
14881517
"akazz",
14891518
"akonyaev",
14901519
"akuzm",
1520+
"albertchae",
14911521
"alburthoffman",
14921522
"alekar",
14931523
"alekseik1",
@@ -1504,6 +1534,7 @@ const char * auto_contributors[] {
15041534
"alexeyerm",
15051535
"alexeypavlenko",
15061536
"alfredlu",
1537+
"alistairjevans",
15071538
"allegrinisante",
15081539
"alsu",
15091540
"amesaru",
@@ -1601,6 +1632,8 @@ const char * auto_contributors[] {
16011632
"conicliu",
16021633
"copperybean",
16031634
"coraxster",
1635+
"craigfinnelly",
1636+
"cuiyanxiang",
16041637
"cw5121",
16051638
"cwkyaoyao",
16061639
"d.v.semenov",
@@ -1615,6 +1648,7 @@ const char * auto_contributors[] {
16151648
"davydovska",
16161649
"ddavid",
16171650
"decaseal",
1651+
"demko",
16181652
"dependabot-preview[bot]",
16191653
"dependabot[bot]",
16201654
"detailyang",
@@ -1633,6 +1667,7 @@ const char * auto_contributors[] {
16331667
"dmitriy",
16341668
"dmitry kuzmin",
16351669
"dongyifeng",
1670+
"dorki",
16361671
"ducle.canh",
16371672
"e-mhui",
16381673
"eaxdev",
@@ -1926,6 +1961,7 @@ const char * auto_contributors[] {
19261961
"minhthucdao",
19271962
"mkalfon",
19281963
"mlkui",
1964+
"mlorek",
19291965
"mmav",
19301966
"mnkonkova",
19311967
"mo-avatar",
@@ -2018,6 +2054,7 @@ const char * auto_contributors[] {
20182054
"redclusive",
20192055
"renwujie",
20202056
"rfraposa",
2057+
"rickykwokmeraki",
20212058
"rienath",
20222059
"ritaank",
20232060
"rnbondarenko",
@@ -2033,6 +2070,7 @@ const char * auto_contributors[] {
20332070
"robot-metrika-test",
20342071
"rodrigargar",
20352072
"rogeryk",
2073+
"romainsalles",
20362074
"roman",
20372075
"romanzhukov",
20382076
"rondo_1895",
@@ -2050,6 +2088,7 @@ const char * auto_contributors[] {
20502088
"santrancisco",
20512089
"sarielwxm",
20522090
"satanson",
2091+
"saurabhojha",
20532092
"save-my-heart",
20542093
"scanhex12",
20552094
"sdairs",
@@ -2080,12 +2119,14 @@ const char * auto_contributors[] {
20802119
"slu",
20812120
"slvrtrn",
20822121
"snyk-bot",
2122+
"somratdutta",
20832123
"songenjie",
20842124
"sperlingxx",
20852125
"spff",
20862126
"spongedc",
20872127
"spume",
20882128
"spyros87",
2129+
"ssive7b",
20892130
"sslouis",
20902131
"stan",
20912132
"stavrolia",
@@ -2096,6 +2137,7 @@ const char * auto_contributors[] {
20962137
"sundy-li",
20972138
"sundyli",
20982139
"sunlisheng",
2140+
"sunningli",
20992141
"sunny",
21002142
"sunny19930321",
21012143
"svladykin",
@@ -2177,6 +2219,7 @@ const char * auto_contributors[] {
21772219
"xbthink",
21782220
"xc0derx",
21792221
"xiao",
2222+
"xiaohuanlin",
21802223
"xiaolei565",
21812224
"xiebin",
21822225
"xiedeyantu",
@@ -2208,6 +2251,7 @@ const char * auto_contributors[] {
22082251
"yinpeiqi",
22092252
"yjant",
22102253
"ylchou",
2254+
"ylw510",
22112255
"yokofly",
22122256
"yonesko",
22132257
"youenn lebras",

0 commit comments

Comments
 (0)