Skip to content

Commit a22f4e1

Browse files
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).
2 parents bbf82b3 + 74e933a commit a22f4e1

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ require (
142142
github.com/muesli/termenv v0.16.0 // indirect
143143
github.com/ncruces/go-strftime v1.0.0 // indirect
144144
github.com/nxadm/tail v1.4.11 // indirect
145+
github.com/onsi/ginkgo/v2 v2.27.5 // indirect
146+
github.com/onsi/gomega v1.39.0 // indirect
145147
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
146148
github.com/pion/datachannel v1.6.0 // indirect
147149
github.com/pion/dtls/v3 v3.1.2 // indirect

0 commit comments

Comments
 (0)