Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport: enable auto-merge on backport PRs #4777

Merged
merged 2 commits into from
Feb 18, 2021
Merged

Conversation

axw
Copy link
Member

@axw axw commented Feb 18, 2021

Motivation/summary

Enable --autoMerge on backport PRs, to remove one more manual step from the process.

How to test these changes

Run backport (5.6.6+), see that auto-merge is enabled.

@axw axw requested a review from a team February 18, 2021 00:48
@codecov-io
Copy link

Codecov Report

Merging #4777 (67ebbe2) into master (5042806) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #4777   +/-   ##
=======================================
  Coverage   76.80%   76.80%           
=======================================
  Files         166      166           
  Lines       10239    10239           
=======================================
  Hits         7864     7864           
  Misses       2375     2375           
Impacted Files Coverage Δ
...ack/apm-server/aggregation/txmetrics/aggregator.go 93.36% <0.00%> (ø)

@apmmachine
Copy link
Contributor

apmmachine commented Feb 18, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #4777 updated

  • Start Time: 2021-02-18T10:04:43.871+0000

  • Duration: 41 min 23 sec

  • Commit: 8ee084a

Test stats 🧪

Test Results
Failed 0
Passed 4751
Skipped 124
Total 4875

Trends 🧪

Image of Build Times

Image of Tests

@axw axw merged commit 4458e4a into elastic:master Feb 18, 2021
@axw axw deleted the backport-automerge branch February 18, 2021 11:15
v1v added a commit to v1v/apm-server that referenced this pull request Feb 22, 2021
…chemas-to-agents

* upstream/master: (111 commits)
  Introduce metricset.name (elastic#4857)
  processor/otel: test service.version handling (elastic#4853)
  docs: Add PHP agent information to shared docs (elastic#4740)
  Script for faster development workflow (elastic#4731)
  Update to elastic/beats@1b31c26 (elastic#4763)
  backport: add 7.12 to .backportrc.json (elastic#4807)
  backport: enable auto-merge on backport PRs (elastic#4777)
  Support for Node.js profiles (elastic#4728)
  docs: readds .NET link (elastic#4764)
  [DOCS] Fixes URLs on Secure communication with APM Agents page (elastic#4746)
  ci: set proper parameters for the tar step (elastic#4696)
  docs: add 7.11.1 release notes (elastic#4727)
  Disable sourcemap upload endpoint when data streams enabled (elastic#4735)
  Add service name to dataset field (elastic#4674)
  Update to elastic/beats@ba423212a660 (elastic#4733)
  sampling: require a default policy (elastic#4729)
  processor/otel: add unit test for span status (elastic#4734)
  Add support for consuming OTLP/gRPC metrics (elastic#4722)
  [apmpackage] Add config options supported in ESS (elastic#4690)
  Use the apm-server version everywhere* (elastic#4725)
  ...
v1v added a commit to v1v/apm-server that referenced this pull request Feb 22, 2021
…te-schema-json-1

* upstream/master: (111 commits)
  Introduce metricset.name (elastic#4857)
  processor/otel: test service.version handling (elastic#4853)
  docs: Add PHP agent information to shared docs (elastic#4740)
  Script for faster development workflow (elastic#4731)
  Update to elastic/beats@1b31c26 (elastic#4763)
  backport: add 7.12 to .backportrc.json (elastic#4807)
  backport: enable auto-merge on backport PRs (elastic#4777)
  Support for Node.js profiles (elastic#4728)
  docs: readds .NET link (elastic#4764)
  [DOCS] Fixes URLs on Secure communication with APM Agents page (elastic#4746)
  ci: set proper parameters for the tar step (elastic#4696)
  docs: add 7.11.1 release notes (elastic#4727)
  Disable sourcemap upload endpoint when data streams enabled (elastic#4735)
  Add service name to dataset field (elastic#4674)
  Update to elastic/beats@ba423212a660 (elastic#4733)
  sampling: require a default policy (elastic#4729)
  processor/otel: add unit test for span status (elastic#4734)
  Add support for consuming OTLP/gRPC metrics (elastic#4722)
  [apmpackage] Add config options supported in ESS (elastic#4690)
  Use the apm-server version everywhere* (elastic#4725)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants