MON-146263 Centreon next 24.04 (Jira release #19990#) (#1602)

centreon · Aug 5, 2024 · fc20456 · fc20456
2 parents d6a4031 + dc09b3f
commit fc20456
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/.version b/.version
@@ -1,2 +1,2 @@
 MAJOR=24.04
-MINOR=4
+MINOR=5
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -135,7 +135,7 @@ endif()
 # Version.
 set(COLLECT_MAJOR 24)
 set(COLLECT_MINOR 04)
-set(COLLECT_PATCH 4)
+set(COLLECT_PATCH 5)
 set(COLLECT_VERSION "${COLLECT_MAJOR}.${COLLECT_MINOR}.${COLLECT_PATCH}")
 add_definitions(-DCENTREON_CONNECTOR_VERSION=\"${COLLECT_VERSION}\")
 

diff --git a/packaging/centreon-broker-core.yaml b/packaging/centreon-broker-core.yaml
@@ -47,9 +47,11 @@ overrides:
     conflicts:
       - centreon-broker-storage
       - centreon-broker-core-devel
+      - centreon-broker-caching_sha2_password
     replaces:
       - centreon-broker-storage
       - centreon-broker-core-devel
+      - centreon-broker-caching_sha2_password
     provides:
       - centreon-broker-storage
       - centreon-broker-core-devel
@@ -65,9 +67,11 @@ overrides:
     conflicts:
       - centreon-broker-storage
       - centreon-broker-core-dev
+      - centreon-broker-caching-sha2-password
     replaces:
       - centreon-broker-storage
       - centreon-broker-core-dev
+      - centreon-broker-caching-sha2-password
     provides:
       - centreon-broker-storage
       - centreon-broker-core-dev