changeset 101:0fb772187f84

back to mainline
author Alain Mazy <am@orthanc.team>
date Mon, 15 Dec 2025 09:58:56 +0100
parents 87a558cf280e (current diff) 81ea9225d5ab (diff)
children fb88ccb7be58
files CMakeLists.txt
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Thu Dec 11 17:09:22 2025 +0100
+++ b/CMakeLists.txt	Mon Dec 15 09:58:56 2025 +0100
@@ -26,7 +26,7 @@
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "94c7f3784456")  # while waiting for 1.12.11 (for BlockingSharedMessageQueue)
+  set(ORTHANC_FRAMEWORK_VERSION "94c7f3784456")  # while waiting for 1.12.11 (for SetCurrentThreadName fix)
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
--- a/NEWS	Thu Dec 11 17:09:22 2025 +0100
+++ b/NEWS	Mon Dec 15 09:58:56 2025 +0100
@@ -1,5 +1,5 @@
-Pending changes in the mainline
-===============================
+Version 1.7 (2025-12-15)
+========================
 
 * new "CommitThreadsCount" configuration to configure the number of threads used to
   perform the "commit" phase of a Push/Pull transfer.  A value > 1 is meaningful 
@@ -14,7 +14,7 @@
   - orthanc_transfers_committed_push_count
   - orthanc_transfers_aborted_push_count
   - orthanc_transfers_push_total_received_bytes_count
-  - orthanc_transfers_push_total_time_spent_in_reception_ms (from the creation of the push transfer till before the commit)
+  - orthanc_transfers_push_total_time_spent_in_reception_ms
   - orthanc_transfers_push_total_time_spent_in_commit_ms