]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #12492 from yehudasa/wip-func-oid-tracing
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 18 Jan 2017 23:19:21 +0000 (15:19 -0800)
committerGitHub <noreply@github.com>
Wed, 18 Jan 2017 23:19:21 +0000 (15:19 -0800)
osd, messenger, librados: lttng oid tracing

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
1  2 
CMakeLists.txt
src/CMakeLists.txt
src/common/config_opts.h
src/os/CMakeLists.txt
src/os/bluestore/BlueStore.cc
src/os/bluestore/BlueStore.h
src/osd/OSD.cc
src/osd/ReplicatedBackend.cc
src/tracing/CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Simple merge
Simple merge