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.

Sign up for GitHub

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

Jump to bottom

fix(controller): bad server-side diffs (#18213) (2.11) #18868

Merged
merged 2 commits into from
Jul 2, 2024
Merged

fix(controller): bad server-side diffs (#18213) (2.11) #18868

merged 2 commits into from
Jul 2, 2024
+3 −3

Conversation

crenshaw-dev
Copy link
Member

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.
  • 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.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

Sorry, something went wrong.

@crenshaw-dev
fix(controller): bad server-side diffs (argoproj#18213) (2.11)

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: B5690EEEBB952194
Verified
Learn about vigilant mode
Loading
Loading status checks…
8377820 
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
crenshaw-dev
crenshaw-dev commented Jul 1, 2024
View reviewed changes
@crenshaw-dev
hopefully the right hash now
Loading
Loading status checks…
38abce4 
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
crenshaw-dev
crenshaw-dev commented Jul 1, 2024
View reviewed changes
go.mod
@@ -13,7 +13,7 @@ require (
github.com/TomOnTime/utfutil v0.0.0-20180511104225-09c41003ee1d
github.com/alicebob/miniredis/v2 v2.30.4
github.com/antonmedv/expr v1.15.2
github.com/argoproj/gitops-engine v0.7.1-0.20240416142647-fbecbb86e412
github.com/argoproj/gitops-engine v0.7.1-0.20240701171035-cd13c1fae823
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Diff: https://github.com/argoproj/gitops-engine/compare/fbecbb86e412..cd13c1fae823

@crenshaw-dev crenshaw-dev marked this pull request as ready for review July 1, 2024 20:23
@crenshaw-dev crenshaw-dev requested a review from a team as a code owner July 1, 2024 20:23
@ishitasequeira ishitasequeira merged commit bfbceff into argoproj:release-2.11 Jul 2, 2024
21 of 22 checks passed
@crenshaw-dev crenshaw-dev deleted the dupe-gvk-2.11 branch July 2, 2024 01:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ishitasequeira ishitasequeira

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@crenshaw-dev @ishitasequeira