From b603d641fb78898185ea560edd774d093f52384b Mon Sep 17 00:00:00 2001 From: Amulya Varote Date: Fri, 3 Dec 2021 11:32:21 -0800 Subject: [PATCH] Modified based on the review comments - 3 Signed-off-by: Amulya Varote --- .../building-blocks/pubsub/howto-publish-subscribe.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md index 4a358cbb4..b183a998c 100644 --- a/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md +++ b/daprdocs/content/en/developing-applications/building-blocks/pubsub/howto-publish-subscribe.md @@ -57,12 +57,16 @@ pubsub.yaml is created by default on a local machine when running `dapr init`. V The pubsub.yaml is created by default on your local machine when running `dapr init`. Verify by opening your components file under `%UserProfile%\.dapr\components\pubsub.yaml` on Windows or `~/.dapr/components/pubsub.yaml` on Linux/MacOS. >>>>>>> 303fc825 (Modified based on the review comments - 2) +<<<<<<< HEAD <<<<<<< HEAD In this example, rabbit mq is used for publish and subscribe. Replace pubsub.yaml file contents with the below contents. >>>>>>> 0e83af7a (Added pub sub documentation) ======= In this example, RabbitMQ is used for publish and subscribe. Replace pubsub.yaml file contents with the below contents. >>>>>>> fbadd23a (Modified based on the review comments - 1) +======= +In this example, RabbitMQ is used for publish and subscribe. Replace `pubsub.yaml` file contents with the below contents. +>>>>>>> d9b29df7 (Modified based on the review comments - 3) ```yaml apiVersion: dapr.io/v1alpha1 @@ -914,11 +918,15 @@ dapr run --app-id orderprocessing --app-port 6001 --dapr-http-port 3601 --dapr-g ## Step 4: ACK-ing a message +<<<<<<< HEAD <<<<<<< HEAD In order to tell Dapr that a message was processed successfully, return a `200 OK` response. If Dapr receives any other return status code than `200`, or if your app crashes, Dapr will attempt to redeliver the message following at-least-once semantics. ======= In order to tell Dapr that a message was processed successfully, return a `200 OK` response. If Dapr receives any other return status code than `200`, or if your app crashes, Dapr will attempt to redeliver the message following At-Least-Once semantics. >>>>>>> 0e83af7a (Added pub sub documentation) +======= +In order to tell Dapr that a message was processed successfully, return a `200 OK` response. If Dapr receives any other return status code than `200`, or if your app crashes, Dapr will attempt to redeliver the message following at-least-once semantics. +>>>>>>> d9b29df7 (Modified based on the review comments - 3) ## Sending a custom CloudEvent