From: Casey Bodley <cbodley@users.noreply.github.com>
Date: Fri, 1 May 2020 13:00:01 +0000 (-0400)
Subject: Merge pull request #34376 from yuvalif/fix_amqp_routable_option
X-Git-Tag: v17.0.0~2482
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e68c60ac73cd34fbd8b712258796f645bf75fcb9;p=ceph.git

Merge pull request #34376 from yuvalif/fix_amqp_routable_option

rgw/amqp: fix the "routable" delivery mode

Reviewed-by: Casey Bodley <cbodley@redhat.com>
---

e68c60ac73cd34fbd8b712258796f645bf75fcb9
diff --cc doc/radosgw/notifications.rst
index fefe56a0eb331,4101b8dd826e4..3762e89075ef4
--- a/doc/radosgw/notifications.rst
+++ b/doc/radosgw/notifications.rst
@@@ -67,11 -63,11 +67,11 @@@ To update a topic, use the same comman
  ::
  
     POST
 +
     Action=CreateTopic
     &Name=<topic-name>
 -   &push-endpoint=<endpoint>
     [&Attributes.entry.1.key=amqp-exchange&Attributes.entry.1.value=<exchange>]
-    [&Attributes.entry.2.key=amqp-ack-level&Attributes.entry.2.value=none|broker]
+    [&Attributes.entry.2.key=amqp-ack-level&Attributes.entry.2.value=none|broker|routable]
     [&Attributes.entry.3.key=verify-ssl&Attributes.entry.3.value=true|false]
     [&Attributes.entry.4.key=kafka-ack-level&Attributes.entry.4.value=none|broker]
     [&Attributes.entry.5.key=use-ssl&Attributes.entry.5.value=true|false]