Skip to content
This repository has been archived by the owner on Sep 17, 2024. It is now read-only.

chore: initialise timeout factor next to the declaration (backport #1118) #1121

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 4, 2021

This is an automatic backport of pull request #1118 done by Mergify.
Cherry-pick of 15a2a3d has failed:

On branch mergify/bp/7.x/pr-1118
Your branch is up to date with 'origin/7.x'.

You are currently cherry-picking commit 15a2a3d7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   e2e/_suites/fleet/ingest_manager_test.go
	modified:   e2e/_suites/helm/helm_charts_test.go
	modified:   internal/common/retry.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   e2e/_suites/kubernetes-autodiscover/autodiscover_test.go

To fix up this pull request, you can check it out locally. See documentation: https://help.github.com/articles/checking-out-pull-requests-locally/


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/

* chore: initialise timeout factor on its own package

* chore: reuse timeout factor from common

(cherry picked from commit 15a2a3d)

# Conflicts:
#	e2e/_suites/kubernetes-autodiscover/autodiscover_test.go
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label May 4, 2021
@mdelapenya mdelapenya closed this May 4, 2021
@mergify mergify bot deleted the mergify/bp/7.x/pr-1118 branch May 4, 2021 13:52
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts There is a conflict in the backported pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant