]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
projects / ceph.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdb1e14 eb51786)
Merge PR #22543 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Tue, 10 Jul 2018 20:24:20 +0000 (13:24 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Tue, 10 Jul 2018 20:24:20 +0000 (13:24 -0700)
* refs/pull/22543/head:
qa/tasks/cephfs: add test for ceph_abort_conn()
libcephfs: introduce ceph_get_instance_id()
client: introduce ceph_abort_conn()

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

diff --cc src/client/Client.cc
Simple merge
diff --cc src/client/Client.h
Simple merge
diff --cc src/pybind/rados/rados.pyx
Simple merge
Unnamed repository; edit this file 'description' to name the repository.