aboutsummaryrefslogtreecommitdiffstats
path: root/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ReplyMerger.java
Commit message (Collapse)AuthorAgeFilesLines
* Update copyrightJon Bratseth2023-10-091-1/+1
|
* Update 2017 copyright notices.gjoranv2021-10-071-1/+1
|
* Revert "Revert "Keep reply with most severe error when merging error replies""Jon Marius Venstad2021-01-071-6/+14
| | | | This reverts commit 9263966a9c697f5acff53a595493e27a2f05e683.
* Revert "Keep reply with most severe error when merging error replies"Jon Marius Venstad2021-01-071-14/+6
|
* Keep reply with most severe error when merging error repliesJon Marius Venstad2021-01-061-6/+14
|
* Update copyright headersJon Bratseth2017-06-141-1/+1
|
* Revert "Update copyright headers"Jon Bratseth2017-06-141-1/+1
|
* Update copyright headersJon Bratseth2017-06-141-1/+1
|
* Revert "Copyright header"Jon Bratseth2017-06-131-1/+1
|
* Copyright headerJon Bratseth2017-06-131-1/+1
|
* fix whitespace onlyArne H Juul2017-01-061-111/+111
|
* transfer state to merged replyArne H Juul2017-01-051-1/+3
| | | | | | * when merging a single error Reply to a new EmptyResult, we would lose state (like the carefully prepared retry delay setting).
* PublishJon Bratseth2016-06-151-0/+109