]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #25866 from yuvalif/add_amqp_push_endpoint_new
authorMatt Benjamin <mbenjamin@redhat.com>
Wed, 20 Feb 2019 12:37:34 +0000 (07:37 -0500)
committerGitHub <noreply@github.com>
Wed, 20 Feb 2019 12:37:34 +0000 (07:37 -0500)
rgw/pubsub: add amqp push endpoint

1  2 
ceph.spec.in
debian/control
install-deps.sh
src/rgw/rgw_op.cc

diff --cc ceph.spec.in
index 93fa39721d28fc54fa702fa3d89fc326db441356,252a1ffecefb2bf97386f2da458b1930d3166cc4..8f004e294a1922717713df50b40a6536722dd817
@@@ -187,8 -187,8 +187,9 @@@ BuildRequires:     xfsprog
  BuildRequires:        xfsprogs-devel
  BuildRequires:        xmlstarlet
  BuildRequires:        yasm
+ BuildRequires:  librabbitmq-devel
  %if 0%{with make_check}
 +BuildRequires:        python%{_python_buildid}-bcrypt
  BuildRequires:        python%{_python_buildid}-coverage
  BuildRequires:        python%{_python_buildid}-nose
  BuildRequires:        python%{_python_buildid}-pecan
diff --cc debian/control
Simple merge
diff --cc install-deps.sh
Simple merge
Simple merge