Prepare for 6.1.0 GA

michael-grunder · michael-grunder · commit 5419cc9c60d1 · 2024-10-04T11:28:33.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,24 @@ All changes to phpredis will be documented in this file.
 We're basing this format on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and PhpRedis adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [6.1.0RC2] - 2024-09-23 ([Github](https://github.com/phpredis/phpredis/releases/6.1.0RC2), [PECL](https://pecl.php.net/package/redis/6.1.0RC2))
+## [6.1.0] - 2024-10-04 ([Github](https://github.com/phpredis/phpredis/releases/6.1.0), [PECL](https://pecl.php.net/package/redis/6.1.0))
+
+**NOTE**: There were no changes to C code between 6.1.0RC2 and 6.1.0.
+
+### Documentation
+
+- Update package.xml to make it clearer that we support many key-value stores
+  [52e69ede](https://github.com/phpredis/phpredis/commit/52e69ede)
+  ([Remi Collet](https://github.com/remicollet))
+- Fix redis.io urls
+  [0bae4bb0](https://github.com/phpredis/phpredis/commit/0bae4bb0)
+  ([Vincent Langlet](https://github.com/VincentLanglet))
+
+### Tests/CI
+
+- Fix 2 tests with redis 6.2
+  [cc1be322](https://github.com/phpredis/phpredis/commit/cc1be322)
+  ([Remi Collet](https://github.com/remicollet))
 
 ### Sponsors :sparkling_heart:
 
@@ -41,6 +58,10 @@ and PhpRedis adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
   [@tillkruss](https://github.com/tillkruss),
   [@deiga](https://github.com/deiga),
   [@tutuna](https://github.com/tutuna)
+  [@VincentLanglet](https://github.com/VincentLanglet)
+
+
+## [6.1.0RC2] - 2024-09-23 ([Github](https://github.com/phpredis/phpredis/releases/6.1.0RC2), [PECL](https://pecl.php.net/package/redis/6.1.0RC2))
 
 ### Fixed
 
diff --git a/package.xml b/package.xml
@@ -22,14 +22,14 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>p.yatsukhnenko@gmail.com</email>
   <active>yes</active>
  </lead>
- <date>2024-09-23</date>
+ <date>2024-10-04</date>
  <version>
-  <release>6.1.0RC2</release>
+  <release>6.1.0</release>
   <api>6.0.0</api>
  </version>
  <stability>
-  <release>beta</release>
-  <api>beta</api>
+  <release>stable</release>
+  <api>stable</api>
  </stability>
  <license uri="http://www.php.net/license">PHP</license>
  <notes>
@@ -41,6 +41,20 @@ http://pear.php.net/dtd/package-2.0.xsd">
     Ty Karok - https://github.com/karock
     Object Cache Pro for WordPress - https://objectcache.pro
 
+    --- 6.1.0 ---
+
+    NOTE: There were no changes to C code between 6.1.0RC2 and 6.1.0
+
+    Documentation:
+
+    * Update package.xml to make it clearer that we support many key-value stores
+      [52e69ede] (Remi Collet)
+    * Fix redis.io urls [0bae4bb0] (Vincent Langlet)
+
+    Tests/CI:
+
+    * Fix 2 tests with redis 6.2 [cc1be322] (Remi Collet)
+
     --- 6.1.0RC2 ---
 
     Fixed:
@@ -253,9 +267,9 @@ http://pear.php.net/dtd/package-2.0.xsd">
  </extsrcrelease>
  <changelog>
  <release>
-   <stability><release>beta</release><api>beta</api></stability>
-   <version><release>6.1.0RC2</release><api>6.0.0</api></version>
-   <date>2024-09-23</date>
+   <stability><release>stable</release><api>stable</api></stability>
+   <version><release>6.1.0</release><api>6.0.0</api></version>
+   <date>2024-10-04</date>
    <notes>
     --- Sponsors ---
 
@@ -265,6 +279,21 @@ http://pear.php.net/dtd/package-2.0.xsd">
     Ty Karok - https://github.com/karock
     Object Cache Pro for WordPress - https://objectcache.pro
 
+    --- 6.1.0 ---
+
+    NOTE: There were no changes to C code between 6.1.0RC2 and 6.1.0
+
+    Documentation:
+
+    * Update package.xml to make it clearer that we support many key-value stores
+      [52e69ede] (Remi Collet)
+    * Fix redis.io urls [0bae4bb0] (Vincent Langlet)
+
+    Tests/CI:
+
+    * Fix 2 tests with redis 6.2 [cc1be322] (Remi Collet)
+
+
     --- 6.1.0RC2 ---
 
     Fixed:
diff --git a/php_redis.h b/php_redis.h
@@ -23,7 +23,7 @@
 #define PHP_REDIS_H
 
 /* phpredis version */
-#define PHP_REDIS_VERSION "6.1.0RC2"
+#define PHP_REDIS_VERSION "6.1.0"
 
 /* For convenience we store the salt as a printable hex string which requires 2
  * characters per byte + 1 for the NULL terminator */
