Commit 575dadb
Reserve RESET_REAPPLY_EXCLUDE_TYPE_CANCEL_REQUEST (#502)
_**READ BEFORE MERGING:** All PRs require approval by both Server AND
SDK teams before merging! This is why the number of required approvals
is "2" and not "1"--two reviewers from the same team is NOT sufficient.
If your PR is not approved by someone in BOTH teams, it may be summarily
reverted._
<!-- Describe what has changed in this PR -->
**What changed?**
Reserve RESET_REAPPLY_EXCLUDE_TYPE_CANCEL_REQUEST option.
<!-- Tell your future self why have you made these changes -->
**Why?**
Cancel request should be reapplied only in conflict resolution case.
There is no option to exclude it for reset.
<!-- Are there any breaking changes on binary or code level? -->
**Breaking changes**
<!-- If this breaks the Server, please provide the Server PR to merge
right after this PR was merged. -->
**Server PR**
---------
Co-authored-by: Chad Retz <[email protected]>1 parent bae790a commit 575dadb
2 files changed
+3
-3
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10864 | 10864 | | |
10865 | 10865 | | |
10866 | 10866 | | |
10867 | | - | |
| 10867 | + | |
10868 | 10868 | | |
10869 | 10869 | | |
10870 | 10870 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
40 | 40 | | |
41 | 41 | | |
42 | 42 | | |
43 | | - | |
44 | | - | |
| 43 | + | |
| 44 | + | |
45 | 45 | | |
46 | 46 | | |
47 | 47 | | |
| |||
0 commit comments