Skip to content

[7.16](backport #28272) Resolved timestamp for defender atp#28293

Merged
andrewkroh merged 3 commits into7.16from
mergify/bp/7.x/pr-28272
Dec 13, 2021
Merged

[7.16](backport #28272) Resolved timestamp for defender atp#28293
andrewkroh merged 3 commits into7.16from
mergify/bp/7.x/pr-28272

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Oct 7, 2021 •
edited by zube bot
Loading

This is an automatic backport of pull request #28272 done by Mergify.

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

@mergify mergify bot added the backport label Oct 7, 2021
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Oct 7, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 7, 2021 •
edited by jenkins-beats-ci bot
Loading

💚 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-12-12T19:28:36.499+0000

  • Duration: 101 min 9 sec

  • Commit: a5527f3

Test stats 🧪

Test Results
Failed 0
Passed 16037
Skipped 2360
Total 18397

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Oct 7, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-28272 upstream/mergify/bp/7.x/pr-28272
git merge upstream/7.x
git push upstream mergify/bp/7.x/pr-28272

@andresrc andresrc changed the base branch from 7.x to 7.16 October 20, 2021 14:52
@andresrc andresrc changed the title [7.x](backport #28272) Resolved timestamp for defender atp [7.16](backport #28272) Resolved timestamp for defender atp Oct 20, 2021
@elasticmachine
Copy link
Copy Markdown
Contributor

elasticmachine commented Oct 25, 2021

Pinging @elastic/security-external-integrations (Team:Security-External Integrations)

@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Oct 25, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Nov 22, 2021

This pull request has not been merged yet. Could you please review and merge it @r00tu53r? 🙏

1 similar comment
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Nov 29, 2021

This pull request has not been merged yet. Could you please review and merge it @r00tu53r? 🙏

@andrewkroh
Copy link
Copy Markdown
Member

andrewkroh commented Nov 29, 2021

@Mergifyio rebase

@r00tu53r
Resolved timestamp for defender atp (#28272)
5434aac 
* Resolved timestamp for defender atp
* Update Changelog for 28272

(cherry picked from commit 0786f89)
@nxei nxei force-pushed the mergify/bp/7.x/pr-28272 branch from ec9d836 to 5434aac Compare November 29, 2021 23:32
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Nov 29, 2021

rebase

✅ Branch has been successfully rebased

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Nov 30, 2021

This pull request is now in conflicts. Could you fix it? 🙏
To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/

git fetch upstream
git checkout -b mergify/bp/7.x/pr-28272 upstream/mergify/bp/7.x/pr-28272
git merge upstream/7.16
git push upstream mergify/bp/7.x/pr-28272

@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Dec 6, 2021

This pull request has not been merged yet. Could you please review and merge it @r00tu53r? 🙏

@andrewkroh andrewkroh merged commit 1aaa42f into 7.16 Dec 13, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-28272 branch December 13, 2021 03:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@andrewkroh andrewkroh andrewkroh approved these changes

Assignees

@r00tu53r r00tu53r

Labels

backport

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@elasticmachine @andrewkroh @jsoriano @r00tu53r