Skip to content

Commit 60e57d0

Browse files
committed
resolve merging conflict as of new version
1 parent 2ef2ed5 commit 60e57d0

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

packages/nginx/changelog.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
# newer versions go on top
2-
- version: "1.18.0"
2+
- version: "1.19.0"
33
changes:
44
- description: Add support for tags in stub status metrics
55
type: enhancement
66
link: https://github.com/elastic/integrations/pull/9081
7+
- version: "1.18.0"
8+
changes:
9+
- description: Enable 'secret' for the sensitive fields, supported from 8.12.
10+
type: enhancement
11+
link: https://github.com/elastic/integrations/pull/9009
712
- version: "1.17.0"
813
changes:
914
- description: Limit request tracer log count to five.

packages/nginx/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.0"
22
name: nginx
33
title: Nginx
4-
version: "1.18.0"
4+
version: "1.19.0"
55
description: Collect logs and metrics from Nginx HTTP servers with Elastic Agent.
66
type: integration
77
categories:

0 commit comments

Comments
 (0)