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

chore: fix merge error in store options #5637

Merged
merged 1 commit into from
Jan 10, 2023
Merged

chore: fix merge error in store options #5637

merged 1 commit into from
Jan 10, 2023

Conversation

michaelbeaumont
Copy link
Contributor

#5574 #5606

Checklist prior to review

  • Link to docs PR or issue --
  • Link to UI issue or PR --
  • Is the issue worked on linked? --
  • The PR does not hardcode values that might break projects that depend on kuma (e.g. "kumahq" as a image registry) --
  • The PR will work for both Linux and Windows, system specific functions like syscall.Mkfifo have equivalent implementation on the other OS --
  • Unit Tests --
  • E2E Tests --
  • Manual Universal Tests --
  • Manual Kubernetes Tests --
  • Do you need to update UPGRADE.md? --
  • Does it need to be backported according to the backporting policy? --
  • Do you need to explicitly set a > Changelog: entry here or add a ci/ label to run fewer/more tests?

@michaelbeaumont
chore: fix merge error in store options
800463f 
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@michaelbeaumont michaelbeaumont requested review from a team, jakubdyszkiewicz and Automaat and removed request for a team January 10, 2023 16:40
@michaelbeaumont michaelbeaumont enabled auto-merge (squash) January 10, 2023 16:42
@michaelbeaumont michaelbeaumont merged commit 6f45254 into kumahq:master Jan 10, 2023
@michaelbeaumont michaelbeaumont deleted the chore/store_merge_fix branch January 10, 2023 17:08
bartsmykla pushed a commit to bartsmykla/kuma that referenced this pull request Jan 14, 2023
@michaelbeaumont @bartsmykla
chore: fix merge error in store options (kumahq#5637)
dd9162a 
Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
Signed-off-by: Bart Smykla <bartek@smykla.com>
@shaneutt shaneutt mentioned this pull request Feb 14, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lukidzi lukidzi lukidzi approved these changes

@jakubdyszkiewicz jakubdyszkiewicz Awaiting requested review from jakubdyszkiewicz

@Automaat Automaat Awaiting requested review from Automaat

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

Successfully merging this pull request may close these issues.
2 participants
@michaelbeaumont @lukidzi