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

[Reporting] Clean up orphaned file #71730

Merged
merged 1 commit into from
Jul 15, 2020

Conversation

tsullivan
Copy link
Member

@tsullivan tsullivan commented Jul 14, 2020

Follow up on this comment: https://github.com/elastic/kibana/pull/67027/files#r454574649

Working in 2 branches got me to manually resolving conflicts between them, and in the process I accidentally refactored code into a separate file in #67027 that was supposed to be deleted per #71031

@tsullivan tsullivan added release_note:skip Skip the PR/issue when compiling release notes v7.9.0 v8.0.0 (Deprecated) Feature:Reporting Use Reporting:Screenshot, Reporting:CSV, or Reporting:Framework instead chore labels Jul 14, 2020
@tsullivan tsullivan force-pushed the reporting/re-delete-file branch 2 times, most recently from d46f49a to 4835fbf Compare July 14, 2020 21:12
...that was accidentally recovered due to incorrect manual merge
@tsullivan tsullivan force-pushed the reporting/re-delete-file branch from 4835fbf to 4f94cb7 Compare July 14, 2020 22:30
@kibanamachine
Copy link
Contributor

💚 Build Succeeded

Build metrics

‼️ unable to find a baseline build for [master@919e0f6]. Try merging the upstream branch and trying again.

History

  • 💔 Build #61668 failed 4835fbf151d5272f4ef5ab5310b718efcfdd0814
  • 💔 Build #61649 failed d46f49a4640119e70de207b9101d01b95d70b9ac
  • 💔 Build #61578 failed c3691d3f05d8ee4ecd07e6a9da43191d2e22e79a

To update your PR or re-run it, just comment with:
@elasticmachine merge upstream

@tsullivan tsullivan changed the title [Reporting] Re-delete a file [Reporting] Clean up orphaned file Jul 15, 2020
@tsullivan tsullivan requested a review from joelgriffith July 15, 2020 02:00
@tsullivan
Copy link
Member Author

Removal of this code was already reviewed in #71031

@tsullivan tsullivan merged commit 0d1c166 into elastic:master Jul 15, 2020
@tsullivan tsullivan deleted the reporting/re-delete-file branch July 15, 2020 02:01
tsullivan added a commit to tsullivan/kibana that referenced this pull request Jul 15, 2020
...that was accidentally recovered due to incorrect manual merge
gmmorris added a commit to gmmorris/kibana that referenced this pull request Jul 15, 2020
* master: (82 commits)
  Fixed the spacing of child accordion items for policy response dialog. (elastic#71677)
  [SECURITY] Timeline bug 7.9 (elastic#71748)
  use fixed isChromeVisible method (elastic#71813)
  [SIEM][Detection Engine][Lists] Adds specific endpoint_list REST API and API for abilities to auto-create the endpoint_list if it gets deleted (elastic#71792)
  [test] Skips flaky Saved Objects Management test
  [APM] Remove watcher integration (elastic#71655)
  [APM] Increase `xpack.apm.ui.transactionGroupBucketSize` (elastic#71661)
  [test] Skips Ingest Manager test preventing ES promotion
  [test] Skips flaky detection engine tests
  Revert "re-fix navigate path for master add SAML login to login_page (elastic#71337)"
  [tests] Temporarily skipped Fleet tests
  [test] Skipped monitoring test
  [Security Solution][Detections] Associate Endpoint Exceptions List to Rule during rule creation/update (elastic#71794)
  Add endpoint exception creation API validation (elastic#71791)
  Skip jest tests that timeout waiting for react (elastic#71801)
  [Security Solution][Exceptions] - Adds filtering to endpoint index patterns by exceptional fields (elastic#71757)
  [Reporting] Re-delete a file (elastic#71730)
  [Security Solution] [Detections] Fixes bug for determining when we hit max signals after filtering with lists (elastic#71768)
  [Ingest Manager] Better display of Fleet requirements (elastic#71686)
  [tests] Temporarily skipped to promote snapshot
  ...
tsullivan added a commit that referenced this pull request Jul 16, 2020
...that was accidentally recovered due to incorrect manual merge

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
chore (Deprecated) Feature:Reporting Use Reporting:Screenshot, Reporting:CSV, or Reporting:Framework instead release_note:skip Skip the PR/issue when compiling release notes v7.9.0 v8.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants