Skip to content

Commit

Permalink
Merge branch 'master' into astorm/aws-sdk-sqs
Browse files Browse the repository at this point in the history
  • Loading branch information
Alan Storm committed Apr 6, 2021
2 parents 4646ca0 + 8d4f10d commit b34cacf
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
10 changes: 6 additions & 4 deletions CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ Notes:
[[release-notes-3.x]]
=== Node.js Agent version 3.x
==== Unreleased
[float]
===== Breaking changes
[[release-notes-3.13.0]]
==== 3.13.0 - 2021/04/06
[float]
===== Features
Expand Down Expand Up @@ -69,6 +67,10 @@ as they are added over time.
[float]
===== Bug fixes
* Lock package dependency "elastic-apm-http-client@9.6.0" to avoid using
v9.7.0 for now, because it is breaking tests. A coming release will get back
on the latest of this dependency. {issues}2032[#2032]
* Remove the "ancestors" field from a log.trace message on startup. Its info
is a duplicate of info in the "startTrace" field in the same log record.
{pull}2005[#2005]
Expand Down
1 change: 1 addition & 0 deletions docs/upgrading.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ The table below is a simplified description of this policy.
[options="header"]
|====
|Agent version |EOL Date |Maintained until
|3.13.x |2022-10-06 |3.14.0
|3.12.x |2022-08-22 |3.13.0
|3.11.x |2022-08-08 |3.12.0
|3.10.x |2022-07-11 |3.11.0
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "elastic-apm-node",
"version": "3.12.1",
"version": "3.13.0",
"description": "The official Elastic APM agent for Node.js",
"main": "index.js",
"types": "index.d.ts",
Expand Down

0 comments on commit b34cacf

Please sign in to comment.