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

chore: consume cluster cache deadlock fix in gitops-engine #13611

Merged
merged 1 commit into from
May 16, 2023

Conversation

jaideepr97
Copy link
Contributor

@jaideepr97 jaideepr97 commented May 16, 2023

This PR just consumes this commit from gitops-engine into argo-cd, which addresses #11458

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • The title of the PR conforms to the Toolchain Guide
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.

Please see Contribution FAQs if you have questions about your pull-request.

Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>
@codecov
Copy link

codecov bot commented May 16, 2023

Codecov Report

Patch and project coverage have no change.

Comparison is base (7825821) 49.22% compared to head (7e23602) 49.22%.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #13611   +/-   ##
=======================================
  Coverage   49.22%   49.22%           
=======================================
  Files         248      248           
  Lines       42830    42830           
=======================================
  Hits        21084    21084           
  Misses      19648    19648           
  Partials     2098     2098           

see 1 file with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@alexmt alexmt merged commit eb6de27 into argoproj:master May 16, 2023
25 checks passed
@alexmt
Copy link
Collaborator

alexmt commented May 16, 2023

/cherry-pick release-2.6

@alexmt
Copy link
Collaborator

alexmt commented May 16, 2023

/cherry-pick release-2.7

@crenshaw-dev
Copy link
Collaborator

/cherry-pick release-2.6

@gcp-cherry-pick-bot
Copy link

Cherry-pick failed with Merge error eb6de27e782e07968be580466faaa495c541bc05 into temp-cherry-pick-b8153d-release-2.6

@crenshaw-dev
Copy link
Collaborator

/cherry-pick release-2.7

@gcp-cherry-pick-bot
Copy link

Cherry-pick failed with Merge error eb6de27e782e07968be580466faaa495c541bc05 into temp-cherry-pick-b8153d-release-2.7

yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
Signed-off-by: Jaideep Rao <jaideep.r97@gmail.com>
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.

None yet

3 participants