Skip to content

Commit 3837b93

Browse files
committed
Fixed merge conflict
1 parent 1296280 commit 3837b93

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

packages/rabbitmq/changelog.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
1-
- version: "1.19.0"
1+
- version: "1.20.0"
22
changes:
3-
<<<<<<< remove-event.original2
43
- description: Allow @custom pipeline access to event.original without setting preserve_original_event.
54
type: enhancement
65
link: https://github.com/elastic/integrations/pull/13518
7-
=======
6+
- version: "1.19.0"
7+
changes:
88
- description: Add SSL support for metrics data streams.
99
type: enhancement
1010
link: https://github.com/elastic/integrations/pull/14215
11-
>>>>>>> main
1211
- version: "1.18.0"
1312
changes:
1413
- description: Add support for Kibana `9.0.0`.

packages/rabbitmq/manifest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
format_version: "3.0.2"
22
name: rabbitmq
33
title: RabbitMQ Logs and Metrics
4-
version: "1.19.0"
4+
version: "1.20.0"
55
description: Collect and parse logs from RabbitMQ servers with Elastic Agent.
66
type: integration
77
categories:

0 commit comments

Comments
 (0)