Merge made by the 'recursive' strategy.
 swh/storage/buffer.py                | 42 ++++++++++++++++++------------------
 swh/storage/cassandra/storage.py     | 17 ++++++++++++---
 swh/storage/cli.py                   |  3 ++-
 swh/storage/interface.py             |  6 +++---
 swh/storage/postgresql/storage.py    |  6 +++---
 swh/storage/retry.py                 | 11 +---------
 swh/storage/tests/test_postgresql.py |  4 ++--
 7 files changed, 46 insertions(+), 43 deletions(-)

Changes applied before test

commit 581fbfd89800432f0ac97355b5758fde3789052c
Merge: 829118a6 9757fe49
Author: Jenkins user <jenkins@localhost>
Date:   Thu Sep 24 14:57:46 2020 +0000

    Merge branch 'diff-target' into HEAD

commit 9757fe498c9309a0c9b91a66a28f218e4e302039
Author: tenma <tenma+swh@mailbox.org>
Date:   Thu Sep 24 15:59:55 2020 +0200

    Add static check to object_type literals in buffers

commit 836f75431b49aec710c5641859941707e10f67ad
Author: tenma <tenma+swh@mailbox.org>
Date:   Thu Sep 24 15:48:41 2020 +0200

    Improve typing of the buffering interface
    
    - use more generic collection types, so that parametrized types can be
    made stricter (e.g. str, in the next revision)
    - remove Optionals that are not needed and provide better defaults

commit dc02bb95f8eca7b85ea592057265cacf2ecb9404
Author: tenma <tenma+swh@mailbox.org>
Date:   Thu Sep 24 14:29:15 2020 +0200

    Fix default value handling in constructor
    
    Use a more simple default value and do not identity check against it.

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/976/ for more details.

Harbormaster completed remote builds in B15510: Diff 14235.Sep 24 2020, 5:02 PM

vlorentz accepted this revision.Sep 24 2020, 6:31 PM

This revision is now accepted and ready to land.Sep 24 2020, 6:31 PM

commit has changed hash

Build is green

Patch application report for D4034 (id=14289)

Could not rebase; Attempt merge onto e8f1136ff7...

Updating e8f1136f..632e99e4
Fast-forward
 swh/storage/buffer.py                | 35 +++++++++++++++++++----------------
 swh/storage/cassandra/storage.py     | 17 ++++++++++++++---
 swh/storage/interface.py             |  6 +++---
 swh/storage/postgresql/storage.py    |  6 +++---
 swh/storage/retry.py                 | 11 +----------
 swh/storage/tests/test_postgresql.py |  4 ++--
 6 files changed, 42 insertions(+), 37 deletions(-)

Changes applied before test

commit 632e99e477aeb6f73815964f8af2c33816d3115a
Author: tenma <tenma+swh@mailbox.org>
Date:   Thu Sep 24 15:59:55 2020 +0200

    Add static check to object_type literals in buffers

commit a75c5caf9df0470fad869b695ecbcacda3040978
Author: tenma <tenma+swh@mailbox.org>
Date:   Thu Sep 24 15:48:41 2020 +0200

    Improve typing of the buffering interface
    
    - use more generic collection types, so that parametrized types can be
    made stricter (e.g. str, in the next revision)
    - remove Optionals that are not needed and provide better defaults

See https://jenkins.softwareheritage.org/job/DSTO/job/tests-on-diff/982/ for more details.

Harbormaster completed remote builds in B15580: Diff 14289.Sep 25 2020, 3:59 PM

Closed by commit rDSTO632e99e477ae: Add static check to object_type literals in buffers (authored by tenma). · Explain WhySep 25 2020, 4:11 PM

This revision was automatically updated to reflect the committed changes.

tenma added a commit: rDSTO632e99e477ae: Add static check to object_type literals in buffers.

tenma mentioned this in D4018: Make all storages compatible with buffering.Sep 25 2020, 4:42 PM