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

revert wildcard keyword changes #4666

Merged
merged 2 commits into from
Feb 1, 2021
Merged

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Feb 1, 2021

Motivation/summary

forward ports #4657:

fix: Revert using wildcards in template
follow up on #4655

fixes #4652

* fix: Revert using wildcards in template

follow up on elastic#4655

fixes elastic#4652
@simitt simitt requested a review from a team February 1, 2021 10:32
@codecov-io
Copy link

Codecov Report

Merging #4666 (2652950) into master (cc2ab7e) will increase coverage by 0.02%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##           master    #4666      +/-   ##
==========================================
+ Coverage   76.17%   76.19%   +0.02%     
==========================================
  Files         161      161              
  Lines        9891     9891              
==========================================
+ Hits         7534     7536       +2     
+ Misses       2357     2355       -2     
Impacted Files Coverage Δ
...ack/apm-server/aggregation/txmetrics/aggregator.go 93.36% <0.00%> (ø)
beater/jaeger/common.go 91.66% <0.00%> (+8.33%) ⬆️

@apmmachine
Copy link
Contributor

apmmachine commented Feb 1, 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 #4666 updated

    • Start Time: 2021-02-01T11:21:45.267+0000
  • Duration: 34 min 50 sec

  • Commit: 9574203

Test stats 🧪

Test Results
Failed 0
Passed 4361
Skipped 123
Total 4484

Steps errors 4

Expand to view the steps failures

Run Window tests
  • Took 10 min 22 sec . View more details on here
Compress
  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=coverage-files.tgz -czf coverage-files.tgz coverage
Compress
  • Took 0 min 0 sec . View more details on here
  • Description: tar --exclude=system-tests-linux-files.tgz -czf system-tests-linux-files.tgz system-tests
Test Sync
  • Took 3 min 23 sec . View more details on here
  • Description: ./.ci/scripts/sync.sh

@simitt simitt merged commit d7336bd into elastic:master Feb 1, 2021
simitt added a commit to simitt/apm-server that referenced this pull request Feb 1, 2021
* fix: Revert using wildcards in template

follow up on elastic#4655

fixes elastic#4652
simitt added a commit that referenced this pull request Feb 1, 2021
* fix: Revert using wildcards in template

follow up on #4655

fixes #4652
@simitt simitt deleted the wildcard-keywords branch August 20, 2021 07:34
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.

Roll back wildcard changes
4 participants