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

Revert overwritten conflicts #1356

Merged
merged 1 commit into from
Oct 31, 2024
Merged

Revert overwritten conflicts #1356

merged 1 commit into from
Oct 31, 2024

Commits on Oct 31, 2024

  1. Revert overwritten conflicts 

    hazelcast#1320 had merge conflicts which lead to [some changes going missing](hazelcast#1320 (comment))

This PR re-instates these.

Specifically:
- reverted the problematic commit locally via GitHub desktop
- discarded any security-related changes
- leaving only the non-security changes to be reverted
    @JackPGreen
    JackPGreen committed Oct 31, 2024
    Configuration menu
    Copy the full SHA
    d77c788 View commit details
    Browse the repository at this point in the history