]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
projects / ceph-ci.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: faab304 7c716be)
Merge PR #35496 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 6 Jul 2020 23:50:30 +0000 (16:50 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 6 Jul 2020 23:50:30 +0000 (16:50 -0700)
* refs/pull/35496/head:
client: introduce timeout for client shutdown

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
1  2 
src/client/Client.cc patch | diff1 | diff2 | blob | history
src/common/options.cc patch | diff1 | diff2 | blob | history

diff --cc src/client/Client.cc
Simple merge
diff --cc src/common/options.cc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.