From d36d8b6831336f9678bde37448617c84be3e6769 Mon Sep 17 00:00:00 2001 From: Patrick LeBlanc Date: Tue, 20 Aug 2019 15:52:40 -0500 Subject: [PATCH] Bring in the fixes to make S3 lib work with google cloud storage. --- storage-manager/CMakeLists.txt | 4 ++-- storage-manager/libmarias3 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/storage-manager/CMakeLists.txt b/storage-manager/CMakeLists.txt index 1b2a1e1f1..47e9b7ed6 100755 --- a/storage-manager/CMakeLists.txt +++ b/storage-manager/CMakeLists.txt @@ -113,8 +113,8 @@ install(TARGETS StorageManager smcat smput smls smrm storagemanager install(FILES ${CMAKE_BINARY_DIR}/lib/libmarias3.so - ${CMAKE_BINARY_DIR}/lib/libmarias3.so.2 - ${CMAKE_BINARY_DIR}/lib/libmarias3.so.2.1.0 + ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3 + ${CMAKE_BINARY_DIR}/lib/libmarias3.so.3.1.2 DESTINATION ${INSTALL_ENGINE}/lib COMPONENT platform ) diff --git a/storage-manager/libmarias3 b/storage-manager/libmarias3 index 85c35d291..a5e324267 160000 --- a/storage-manager/libmarias3 +++ b/storage-manager/libmarias3 @@ -1 +1 @@ -Subproject commit 85c35d291b19d2d30e0a2da7469748a85ed92aae +Subproject commit a5e32426728aedcbee42f7909cdc11b4d6cc8535