Merge tag 'release_26.4.16' into mariadb-4.x

codership · Aug 22, 2023 · 4218caf · 4218caf
2 parents 2c40f55 + c333b19
commit 4218caf
Show file tree

Hide file tree

Showing 31 changed files with 468 additions and 361 deletions.
diff --git a/GALERA_VERSION b/GALERA_VERSION
@@ -1,4 +1,4 @@
 GALERA_VERSION_WSREP_API=26
 GALERA_VERSION_MAJOR=4
-GALERA_VERSION_MINOR=14
+GALERA_VERSION_MINOR=16
 GALERA_VERSION_EXTRA=
diff --git a/SConstruct b/SConstruct
@@ -170,7 +170,7 @@ static_ssl = ARGUMENTS.get('static_ssl', None)
 install = ARGUMENTS.get('install', None)
 version_script = int(ARGUMENTS.get('version_script', 1))
 
-GALERA_VER = ARGUMENTS.get('version', '4.14')
+GALERA_VER = ARGUMENTS.get('version', '4.16')
 GALERA_REV = ARGUMENTS.get('revno', 'XXXX')
 
 # Attempt to read from file if not given

diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,5 @@
-galera-4 (26.4.14) UNRELEASED; urgency=medium
+galera-4 (26.4.16) UNRELEASED; urgency=medium
 
   * Galera 4 release
 
- -- Codership Oy <[email protected]>  Thu, 26 Jan 2023 09:31:00 +0200
+ -- Codership Oy <[email protected]>  Mon, 14 Aug 2023 15:02:38 +0300
diff --git a/galera/src/SConscript b/galera/src/SConscript
@@ -33,7 +33,6 @@ libgaleraxx_srcs = [
     'ist.cpp',
     'gcs_dummy.cpp',
     'saved_state.cpp',
-    'event_service.cpp',
     'galera_view.cpp'
 ]