Conversation
Contributor
pasin
commented
Jul 10, 2025
pasin
commented
- Added merge-dict conflict resolver spec.
- Bump API spec version to 2.0.1.
- Implemented merge-dict resolver in iOS.
* Added merge-dict conflict resolver spec. * Bump API spec version to 2.0.1. * Implemented merge-dict resolver in iOS.
Redocly preview |
pasin
changed the title
borrrden
approved these changes
Jul 11, 2025
barkha06
pushed a commit
that referenced
this pull request
Oct 13, 2025
* Added merge-dict conflict resolver spec. * Bump API spec version to 2.0.1. * Implemented merge-dict resolver in iOS. Update iOS TestServer to log to console synchronously
borrrden
added a commit
that referenced
this pull request
Oct 24, 2025
* Added conflicts, end-to-end,system and volume tests for CBL -3.3.0. * Added mesh sanity, consistency, peer addition and removal and network partition tests * Added test for Large-Size Doc replication --------- Co-authored-by: Pasin Suriyentrakorn <pasin@couchbase.com> CBL-7192: Don't reject a payload because of unknown keys (#241) This means that any addition in the spec will be invalid until handled properly, which causes dev friction Fix errors present in Jenkinsfile (#242) * Put all locks in a single lock statement * Make CBL_BUILD optional to prepare for its removal Fix flaw in Android merge-dict conflict resolver It was setting "docProp" on the resulting dictionary instead of "key" Update verify_python.sh Add explicit package bases to tests folder for validation Use full path in import to account for new setting * Add merge-dict conflict resolver spec and Implement in iOS (#234) * Added merge-dict conflict resolver spec. * Bump API spec version to 2.0.1. * Implemented merge-dict resolver in iOS. Update iOS TestServer to log to console synchronously * Removed changes to multipeer_funtional/topology.json * Set download param in all multipeer topology files --------- Co-authored-by: Sanjivani Patra <sanjivani.patra@couchbase.com> Co-authored-by: vipbhardwaj <vipulbhardwaj1011@gmail.com> Co-authored-by: Jim Borden <jim.borden@couchbase.com> Co-authored-by: Pasin Suriyentrakorn <pasin@couchbase.com>
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.