leizhiyuan commented on issue #1412:
URL:
https://github.com/apache/rocketmq-clients/issues/1412#issuecomment-6331018750
### How to merge (start here)
Merge from top to bottom. When a PR shows a conflict, wait: I rebase it,
you don't need to resolve anything.
| # | PR | Fixes | Before merging |
|---|---|---|---|
| 1 | #1407 | LitePushConsumer receives nothing when the server decorates
topic names (#1406) | Nothing. **Merge first.** |
| 2 | #1420 | Reject blank lite topic (#1418) | Nothing |
| 3 | #1421 | Accept `http://` / `https://` in the access URL (#1419) |
Nothing |
| 4 | #1416 | Lite batch is silently lost (#1415) | Confirm the
`batch_send` behavior change (see PR) |
| 5 | #1411 | Listener panic kills the consumer worker (#1410) | I push a
small test fix after #1407 |
| 6 | #1414 | FIFO retry does not increase `delivery_attempt` (#1413) | I
rebase onto #1411 |
| 7 | #1429 | Compressed body not decompressed (#1428) | I rebase onto
#1411 + #1414 |
| 8 | #1404 | Telemetry session recovery (#1403), not mine | Its author
resolves a one-line test conflict with #1411. **After this, master CI is green
again.** |
| 9 | #1381 | LiteSimpleConsumer, not mine | Its author rebases onto
#1404 |
| 10 | #1425 | Receive deadline ignores server long polling timeout
(#1424) | **Only after #1404.** I rebase to drop the temporary merge commit |
| 11 | #1423 | `shutdown()` takes minutes (#1422) | **Only after #1404
and #1381.** I rebase |
| 12 | #1409 | LitePushConsumer ignores server lite settings (#1408) | I
rebase onto #1404 + #1381 |
| 13 | #1435 | LiteSimpleConsumer `suspend` (#1434) | **Only after
#1381.** I rebase |
| 14 | #1427 | `receive` panics on bad arguments (#1426) | I rebase onto
#1381 |
| 15 | #1431 | Ack after `change_invisible_duration` silently ignored
(#1430) | I rebase onto #1427 |
| 16 | #1433 | Consumer keeps working after a failed `start()` (#1432) |
I rebase |
| 17 | #1439 | `receipt_handle()` panics (#1438) | I rebase onto #1431 |
| 18 | #1441 | Unreadable / slave queues, always starts at queue 0
(#1440) | I rebase onto #1381 |
| — | #1437 | Timestamps in seconds (#1436) | **On hold:** needs your
decision on the unit change. No conflicts, merge any time after |
- Rows 1–4 can be merged in any order, at any time.
- The only hard rule: rows 10–13 must not be merged before rows 8–9. They
contain temporary merge commits of #1404 / #1381.
- The 3 red CI checks on rows 1–7 come from `master` (Clippy
`for_kv_map`, MSRV) and go away after #1404 (row 8).
- Pairwise conflict details: see "Overlaps" below.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
