# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1688481571 -7200
# Node ID e2746201996a92f115e93767f9860c5ff14caaa7
# Parent  17165a5540f65962aa6b478cc2774d85d44f85f9
Orthanc-1.12.1

diff -r 17165a5540f6 -r e2746201996a CITATION.cff
--- a/CITATION.cff	Tue Jul 04 12:20:41 2023 +0200
+++ b/CITATION.cff	Tue Jul 04 16:39:31 2023 +0200
@@ -10,5 +10,5 @@
 doi: "10.1007/s10278-018-0082-y"
 license: "GPL-3.0-or-later"
 repository-code: "https://hg.orthanc-server.com/orthanc/"
-version: 1.12.0
-date-released: 2023-04-14
+version: 1.12.1
+date-released: 2023-07-04
diff -r 17165a5540f6 -r e2746201996a NEWS
--- a/NEWS	Tue Jul 04 12:20:41 2023 +0200
+++ b/NEWS	Tue Jul 04 16:39:31 2023 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.12.1 (2023-07-04)
+===========================
+
 General
 -------
 
@@ -37,10 +41,10 @@
 * When deleting a resource, the "LastUpdate" metadata of its parents are now updated
 * Reduced the memory usage when downloading archives when "ZipLoaderThreads" > 0
 * Metrics can be stored either as floating-point numbers, or as integers
+* Reduce the frequency of memory trimming from 100ms to 30s to avoid high idle
+  CPU load (https://discourse.orthanc-server.org/t/onchange-callbacks-and-cpu-loads/3534).
 * Upgraded dependencies for static builds:
   - boost 1.82.0
-* Reduce the frequency of memory trimming from 100ms to 30s to avoid high idle
-  CPU load (https://discourse.orthanc-server.org/t/onchange-callbacks-and-cpu-loads/3534).
 
 
 Version 1.12.0 (2023-04-14)
diff -r 17165a5540f6 -r e2746201996a OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Tue Jul 04 12:20:41 2023 +0200
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Tue Jul 04 16:39:31 2023 +0200
@@ -24,7 +24,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "mainline")
+set(ORTHANC_VERSION "1.12.1")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning