Skip to content

N
neo
Commit 5e7c4dff authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

Merge branch 't' into t2 

* t:
  .
  .
parents 95fbc76f 2f5df08a
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
go/NOTES
View file @ 5e7c4dff
...@@ -52,7 +52,7 @@ LastIDs PM -> S S -> PM ...@@ -52,7 +52,7 @@ LastIDs PM -> S S -> PM
PartitionTable PM -> S S -> PM PartitionTable PM -> S S -> PM
NotifyPartitionTable PM -> S, C NotifyPartitionTable PM -> S, C
PartitionChanges PM -> S, C // subset of NotifyPartitionTable (?) PartitionChanges PM -> S, C // δ(partTab)
StartOperation PM -> S StartOperation PM -> S
StopOperation PM -> S StopOperation PM -> S
......
go/zodb/pydata.go
View file @ 5e7c4dff
...@@ -69,7 +69,7 @@ func encodePyData(pyclass pickle.Class, pystate interface{}) PyData { ...@@ -69,7 +69,7 @@ func encodePyData(pyclass pickle.Class, pystate interface{}) PyData {
p := pickle.NewEncoderWithConfig(buf, &pickle.EncoderConfig{ p := pickle.NewEncoderWithConfig(buf, &pickle.EncoderConfig{
// allow pristine python2 to decode the pickle. // allow pristine python2 to decode the pickle.
// TODO 2 -> 3 since ZODB5 switched to it and uses zodbpickle. // TODO 2 -> 3 since ZODB5 switched to it and uses zodbpickle.
Protocol: 2, // XXX -> 3? Protocol: 2,
PersistentRef: persistentRef, PersistentRef: persistentRef,
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7