# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1609776858 -3600
# Node ID b649aebfcc6137b20113f0613e7c35faca40271c
# Parent  8a7a5defd5d0fca82c07e9b434879e484f1d1427# Parent  7ddd840563c9487fd2f6846ef64984f4fa0cb7f6
merge

diff -r 7ddd840563c9 -r b649aebfcc61 Aws/CMakeLists.txt
--- a/Aws/CMakeLists.txt	Tue Nov 10 14:14:24 2020 +0100
+++ b/Aws/CMakeLists.txt	Mon Jan 04 17:14:18 2021 +0100
@@ -9,7 +9,7 @@
 include(CheckIncludeFileCXX)
 
 set(ORTHANC_FRAMEWORK_SOURCE "hg" CACHE STRING "orthanc source")
-set(ORTHANC_FRAMEWORK_VERSION "1.7.3" CACHE STRING "orthanc framework version")
+set(ORTHANC_FRAMEWORK_VERSION "1.8.2" CACHE STRING "orthanc framework version")
 set(USE_VCPKG_PACKAGES ON CACHE BOOL "Use vcpkg to link against crypto++ and AWS SDK")
 set(STATIC_AWS_CLIENT ON CACHE BOOL "Statically link against AWS client library (only if USE_VCPKG_PACKAGES=OFF)")
 set(ALLOW_DOWNLOADS ON)
diff -r 7ddd840563c9 -r b649aebfcc61 Common/StoragePlugin.cpp
--- a/Common/StoragePlugin.cpp	Tue Nov 10 14:14:24 2020 +0100
+++ b/Common/StoragePlugin.cpp	Mon Jan 04 17:14:18 2021 +0100
@@ -39,6 +39,8 @@
 
 #include "../Common/EncryptionHelpers.h"
 #include "../Common/EncryptionConfigurator.h"
+
+#include <Logging.h>
 #include <SystemToolbox.h>
 
 static std::unique_ptr<IStoragePlugin> plugin;