# HG changeset patch # User Sebastien Jodogne # Date 1611306737 -3600 # Node ID 303708bc73d8e84b704f9e5f3fe560e79dc89a8f # Parent d88ae86b7b7940c719579bc9a2d48b056e826c73# Parent 950c1fb892ad8f990a64c844ae180ca018d2ba84 back to mainline diff -r d88ae86b7b79 -r 303708bc73d8 CMakeLists.txt --- a/CMakeLists.txt Fri Jan 22 09:59:19 2021 +0100 +++ b/CMakeLists.txt Fri Jan 22 10:12:17 2021 +0100 @@ -7,7 +7,7 @@ set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg") else() - set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.1") + set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.8.2") set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web") endif() diff -r d88ae86b7b79 -r 303708bc73d8 NEWS --- a/NEWS Fri Jan 22 09:59:19 2021 +0100 +++ b/NEWS Fri Jan 22 10:12:17 2021 +0100 @@ -1,6 +1,10 @@ Pending changes in the mainline =============================== + +Version 3.1 (2021-01-22) +======================== + * Fix possible deadlock with "orthanc.RegisterOnChangeCallback()" * During Orthanc shutdown, wait for all the pending events to have been processed