From: Kefu Chai <kchai@redhat.com>
Date: Thu, 22 Jul 2021 07:33:13 +0000 (+0800)
Subject: Merge pull request #38783 from ideepika/wip-osd-tracing
X-Git-Tag: v17.1.0~1325
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=7048172cad76084707c6cef42c0f903e3091060b;p=ceph.git

Merge pull request #38783 from ideepika/wip-osd-tracing

cmake/ninja: support ninja for jaegertracing

Reviewed-by: Kefu Chai <kchai@redhat.com>
---

7048172cad76084707c6cef42c0f903e3091060b
diff --cc ceph.spec.in
index 1bfa9fcb129b,c62599a8a411..041c5be48d1d
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@@ -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