Commit a22f4e1
committed
Merge branch 'main' into feat/teranode-native-ops
Trivial: origin/main now contains PR #886 (squash-merged as 74e933a).
Our branch already cherry-picked the same content earlier, so the three
file-level conflicts in stores/utxo/aerospike/ (aerospike.go, set_mined.go,
teranode.go) are PR #886's changes-vs-themselves-plus-PR-#828-extras. Kept
HEAD in each case — it has both the cherry-picked PR #886 work and the
PR #828 additions (useNativeTeranodeOps field on the Store, richer
batchRecord diagnostics in processSingleBatchRecordPooled, luaResponse*
helpers in parseLuaMapResponseInto for native-op response shapes).1 file changed
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
142 | 142 | | |
143 | 143 | | |
144 | 144 | | |
| 145 | + | |
| 146 | + | |
145 | 147 | | |
146 | 148 | | |
147 | 149 | | |
| |||
0 commit comments