]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #38783 from ideepika/wip-osd-tracing
authorKefu Chai <kchai@redhat.com>
Thu, 22 Jul 2021 07:33:13 +0000 (15:33 +0800)
committerGitHub <noreply@github.com>
Thu, 22 Jul 2021 07:33:13 +0000 (15:33 +0800)
cmake/ninja: support ninja for jaegertracing

Reviewed-by: Kefu Chai <kchai@redhat.com>
1  2 
ceph.spec.in
debian/control
install-deps.sh
src/CMakeLists.txt
src/vstart.sh

diff --cc ceph.spec.in
index 1bfa9fcb129b9e51dc9a0d9eaf95b121bccc5df9,c62599a8a4116e1e11048d42f8746a5893ec1a63..041c5be48d1de716ee1b543418748ee8675014c7
@@@ -286,9 -288,9 +289,8 @@@ BuildRequires:  gnutls-deve
  BuildRequires:  hwloc-devel
  BuildRequires:  libpciaccess-devel
  BuildRequires:  lksctp-tools-devel
 -BuildRequires:  protobuf-devel
  BuildRequires:  ragel
  BuildRequires:  systemtap-sdt-devel
- BuildRequires:  yaml-cpp-devel
  %if 0%{?fedora}
  BuildRequires:  libubsan
  BuildRequires:  libasan
diff --cc debian/control
Simple merge
diff --cc install-deps.sh
Simple merge
Simple merge
diff --cc src/vstart.sh
Simple merge