# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1688488792 -7200
# Node ID 65b4e6ae27039b8abc30690ede953d2364b4418e
# Parent  17165a5540f65962aa6b478cc2774d85d44f85f9# Parent  e2746201996a92f115e93767f9860c5ff14caaa7
back to mainline

diff -r 17165a5540f6 -r 65b4e6ae2703 CITATION.cff
--- a/CITATION.cff	Tue Jul 04 12:20:41 2023 +0200
+++ b/CITATION.cff	Tue Jul 04 18:39:52 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 65b4e6ae2703 NEWS
--- a/NEWS	Tue Jul 04 12:20:41 2023 +0200
+++ b/NEWS	Tue Jul 04 18:39:52 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 65b4e6ae2703 OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Tue Jul 04 12:20:41 2023 +0200
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Tue Jul 04 18:39:52 2023 +0200
@@ -156,6 +156,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "5c1b11009d782f248739919db6bf7f7a")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.0")
         set(ORTHANC_FRAMEWORK_MD5 "d32a0cde03b6eb603d8dd2b33d38bf1b")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.12.1")
+        set(ORTHANC_FRAMEWORK_MD5 "8a435140efc8ff4a01d8242f092f21de")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r 17165a5540f6 -r 65b4e6ae2703 OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake