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

[7.x] Fix minor diff to master #3546

Merged
merged 4 commits into from
Mar 24, 2020
Merged

[7.x] Fix minor diff to master #3546

merged 4 commits into from
Mar 24, 2020

Conversation

simitt
Copy link
Contributor

@simitt simitt commented Mar 24, 2020

Motivation/summary

This backports some minor changes from master to 7.x to keep diffs smal.

Checklist

- [ ] I have signed the Contributor License Agreement.
- [ ] My code follows the style guidelines of this project (run make check-full for static code checks and linting)

  • I have rebased my changes on top of the latest 7.x branch

- [ ] I have made corresponding changes to the documentation

  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes

- [ ] I have updated CHANGELOG.asciidoc

How to test these changes

Related issues

Validation `nonzero` is broken with latest beats update. Temporarily
implement validation instead of using validation tags until
elastic/go-ucfg#147 is fixed.

backports commit f604f27
@simitt simitt added the v7.7.0 label Mar 24, 2020
@simitt simitt requested a review from a team March 24, 2020 17:46
@codecov-io
Copy link

Codecov Report

Merging #3546 into 7.x will not change coverage by %.
The diff coverage is n/a.

@@           Coverage Diff           @@
##              7.x    #3546   +/-   ##
=======================================
  Coverage   79.31%   79.31%           
=======================================
  Files         109      109           
  Lines        5839     5839           
=======================================
  Hits         4631     4631           
  Misses       1208     1208           

@simitt simitt merged commit 6996b79 into elastic:7.x Mar 24, 2020
@simitt simitt deleted the fix-minor-diff branch March 25, 2020 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants