Resolve merge conflicts between v2.x and main #1247
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Added support for SORT_RO command * Codestyle fixes * Added command description --------- Co-authored-by: Vladyslav Vildanov <vladyslavvildanov@Vladyslav-Vildanov-MacBook-Pro.local>
* Added support for container commands FUNCTION LOAD, FUNCTION DELETE and FCALL * Changed ContainerInterface and AbstractContainer * Re-implement logic of abstract methods --------- Co-authored-by: Vladyslav Vildanov <vladyslavvildanov@Vladyslav-Vildanov-MacBook-Pro.local>
Co-authored-by: Vladyslav Vildanov <vladyslavvildanov@Vladyslav-Vildanov-MacBook-Pro.local>
…redis#1168) * Add option for disabling reads to slaves in replication topologies (cherry picked from commit e132c31) * remove empty line --------- Co-authored-by: Till Krüss <tillkruss@users.noreply.github.com>
* match `MasterSlaveReplication` also the name of this method 😬 * Update SentinelReplication.php
* Added CODEOWNERS file * Update CODEOWNERS * Applied whole Redis commands path as @vladvildanov codeowner * Set @predis/team as Redis commands codeowners * Update CODEOWNERS --------- Co-authored-by: Vladyslav Vildanov <vladyslavvildanov@Vladyslav-Vildanov-MacBook-Pro.local> Co-authored-by: Till Krüss <tillkruss@users.noreply.github.com>
* Deprecate webdis and phpiredis * remove space
…redis#1193) * Added support for ACL GETUSER, SETUSER, DRYRUN commands * Change test to support Redis > 6.0.0 * Removed selectors check
* Added missing stream key prefixes * Tested stream command key prefixing
chayim
approved these changes
Apr 3, 2023
Contributor
chayim
left a comment
There was a problem hiding this comment.
Let's wait on @tillkruss to merge obvi
Contributor
Author
|
@chayim It's not a main PR, it's just resolving conflicts between |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
@shacharPash