Skip to content

Conversation

@eyalkoren
Copy link
Contributor

@eyalkoren eyalkoren commented Jul 22, 2021

No description provided.

@eyalkoren eyalkoren enabled auto-merge (squash) July 22, 2021 05:57
@eyalkoren eyalkoren disabled auto-merge July 22, 2021 05:57
@eyalkoren eyalkoren merged commit 69ca5fe into elastic:master Jul 22, 2021
@eyalkoren eyalkoren deleted the release-1.25.0 branch July 22, 2021 05:58
v1v added a commit to v1v/apm-agent-java that referenced this pull request Jul 27, 2021
* master:
  Bump version.slf4j from 1.7.31 to 1.7.32 (elastic#1933)
  Add description about memory pool metrics to docs (elastic#1925)
  updated team membership check in action
  Add 1.25.0 to cloudfoundry index
  Update CHANGELOG.asciidoc (elastic#1929)
  fixed community label action
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release v1.25.0
  Prepare release 1.25.0 (elastic#1927)
  synchronize json schema specs (elastic#1926)
  added labeling of community issues and PRs
  added community labeler config
  Upgrade Byte Buddy to 1.11.8 (elastic#1923)
  Bump json-schema-validator from 1.0.56 to 1.0.57 (elastic#1916)
  Bump log4j2-ecs-layout from 1.0.1 to 1.1.0 (elastic#1917)
  Added support for setting the framework using the public api (elastic#1908) (elastic#1909)
  Add Javalin plugin (elastic#1822)
v1v added a commit to v1v/apm-agent-java that referenced this pull request Aug 2, 2021
…for-windows-only

* upstream/master: (100 commits)
  [CI] Enable compatibility test matrix for unit tests (elastic#1915)
  Updated get-user-teams-membership to version 1.0.3
  ensure that the socket is closed even if there is an exception from the other close (elastic#1946)
  Make sure trace context headers are added only once (elastic#1937)
  Update CHANGELOG.asciidoc
  Ecs reformatting more fields (elastic#1910)
  Use path when high-level framework method is unknown (elastic#1906)
  Semver parsing enhancement (elastic#1931)
  Bump version.slf4j from 1.7.31 to 1.7.32 (elastic#1933)
  Add description about memory pool metrics to docs (elastic#1925)
  updated team membership check in action
  Add 1.25.0 to cloudfoundry index
  Update CHANGELOG.asciidoc (elastic#1929)
  fixed community label action
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release v1.25.0
  Prepare release 1.25.0 (elastic#1927)
  synchronize json schema specs (elastic#1926)
  added labeling of community issues and PRs
  added community labeler config
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant