Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Revert "handle empty objects in sync DELETEs" #9726

Merged
merged 1 commit into from
Jun 27, 2017
Merged

Revert "handle empty objects in sync DELETEs" #9726

merged 1 commit into from
Jun 27, 2017

Conversation

diracdeltas
Copy link
Member

@diracdeltas diracdeltas commented Jun 26, 2017

This reverts commit 91ef559 and pulls in fixes from the sync implementation in 0.17.x

fix #9724

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.

Test Plan:
see #9724
bonus points: re-run test plan from brave/sync#111

Reviewer Checklist:

Tests

  • Adequate test coverage exists to prevent regressions
  • Tests should be independent and work correctly when run individually or as a suite ref
  • New files have MPL2 license header

@diracdeltas diracdeltas added this to the 0.18.x (Developer Channel) milestone Jun 26, 2017
@diracdeltas diracdeltas requested review from ayumi and removed request for ayumi June 26, 2017 23:28
This reverts commit 91ef559.

it also re-fixes #9308 after the revert and fixes handling of skipSync (#111)

Test Plan:
Test plan in brave/sync#111
@diracdeltas
Copy link
Member Author

diracdeltas commented Jun 27, 2017

syncing tests seem borked on this branch but they're also borked on master so probably not related to the changes

Copy link
Contributor

@ayumi ayumi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#9724 success

brave/sync#111 success

🐓

@diracdeltas diracdeltas merged commit 27b0547 into master Jun 27, 2017
@diracdeltas diracdeltas deleted the fix/9724 branch June 27, 2017 20:04
@bsclifton
Copy link
Member

@diracdeltas can you make sure this gets merged to 0.18.x also?

@diracdeltas
Copy link
Member Author

yup

diracdeltas added a commit that referenced this pull request Jun 27, 2017
Revert "handle empty objects in sync DELETEs"
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

bookmark deletion may lead to duplicated bookmarks
4 participants