From aea4a275e28329f648e046469c095eef74254bb2 Mon Sep 17 00:00:00 2001 From: Eric Salo Date: Wed, 7 Dec 2022 20:46:08 -0800 Subject: [PATCH 1/2] Updating changelog --- CHANGES.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGES.txt b/CHANGES.txt index 98cdf2091c49..cf6a74db8f2c 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,8 @@ +2022-12-07 version 21.11 (C++/Java/Python/PHP/Objective-C/C#/Ruby) + Python + * Add license file to pypi wheels (#10936) + * Fix round-trip bug (#10158) + 2022-11-29 version 21.10 (C++/Java/Python/PHP/Objective-C/C#/Ruby) Java From 44eafb2f651436fd583051f137556ffcf43bd1d9 Mon Sep 17 00:00:00 2001 From: Eric Salo Date: Thu, 8 Dec 2022 00:56:59 -0800 Subject: [PATCH 2/2] Update version.json to: 21.12-dev --- version.json | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/version.json b/version.json index e76162bb2028..d134b24033c4 100644 --- a/version.json +++ b/version.json @@ -1,17 +1,17 @@ { "21.x": { - "protoc_version": "21.11", + "protoc_version": "21.12-dev", "lts": false, - "date": "2022-12-07", + "date": "2022-12-08", "languages": { - "cpp": "3.21.11", - "csharp": "3.21.11", - "java": "3.21.11", - "javascript": "3.21.11", - "objectivec": "3.21.11", - "php": "3.21.11", - "python": "4.21.11", - "ruby": "3.21.11" + "cpp": "3.21.12-dev", + "csharp": "3.21.12-dev", + "java": "3.21.12-dev", + "javascript": "3.21.12-dev", + "objectivec": "3.21.12-dev", + "php": "3.21.12-dev", + "python": "4.21.12-dev", + "ruby": "3.21.12-dev" } } } \ No newline at end of file