From: Yuri Weinstein <yweinste@redhat.com>
Date: Tue, 25 Aug 2020 22:06:56 +0000 (-0700)
Subject: Merge pull request #35962 from smithfarm/wip-46389-octopus
X-Git-Tag: v15.2.5~24
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=aeda823321d34426d3bd8f2df6c4abdf163894c7;p=ceph.git

Merge pull request #35962 from smithfarm/wip-46389-octopus

octopus: client: introduce timeout for client shutdown

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

aeda823321d34426d3bd8f2df6c4abdf163894c7
diff --cc src/client/Client.cc
index 5a2cf3d2a2ed,5df9abbc1502..5de2eb2e50f0
mode 100755,100644..100755
--- a/src/client/Client.cc
+++ b/src/client/Client.cc