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

[3.1.6 Backport] CBG-3878: Fix losing user xattr on import feed for docs with no sync data #6796

Merged
merged 4 commits into from
May 1, 2024
Merged

[3.1.6 Backport] CBG-3878: Fix losing user xattr on import feed for docs with no sync data #6796

merged 4 commits into from
May 1, 2024

Conversation

bbrks
Copy link
Member

@bbrks bbrks commented May 1, 2024 •
edited
Loading

CBG-3878

Backports #6755 and #6781 to 3.1.6

  • Test fixes for unavailable and not easily cherry-pickable dependencies (multi-xattr and Rosmar SG-bucket API changes)

Integration Tests

gregns1 and others added 4 commits April 29, 2024 15:55
@gregns1 @bbrks
[3.1.6 Backport] CBG-3869: Fix losing user xattr on import feed for d…
77617fb 
…ocs with no sync data (#6755)

* CBG-3869: Fix losing user xattr on import feed for docs with no sync data

* update to new api spec

* updates off review
@gregns1 @bbrks
CBG-3891: fix for panic in TestUnmarshalDocFromImportFeed on anemone …
a20e92b 
…branch (#6781)
@bbrks
Remove unavailable sg-bucket Xattr dependencies by using hardcoded DC…
723af13 
…P encoded values in TestUnmarshalDocFromImportFeed
@bbrks
Adapt TestAutoImportUserXattrNoSyncData to work without multi-xattr c…
3ea4beb 
…hanges
@bbrks bbrks changed the title [3.1.6 Backport] CBG-3869: Fix losing user xattr on import feed for docs with no sync data [3.1.6 Backport] CBG-3878: Fix losing user xattr on import feed for docs with no sync data May 1, 2024
@torcolvin torcolvin merged commit 18bd338 into release/3.1.6 May 1, 2024
24 checks passed
@torcolvin torcolvin deleted the CBG-3878 branch May 1, 2024 14:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@torcolvin torcolvin torcolvin approved these changes

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

Successfully merging this pull request may close these issues.
3 participants
@bbrks @torcolvin @gregns1