Skip to content

Commit 35086bc

Browse files
committed
Merge remote-tracking branch 'couchbase/alice' into mad-hatter
Perform a no-op merge "ours" merge of alice into mad-hatter, to keep history tidy and silence 'unmerged_commits.py' script. Using --stategy=ours, given all these changes are just backports already in mad-hatter - i.e. this makes zero actual code changes to mad-hatter. * couchbase/alice: MB-43055: [BP] Ensure ItemPager available is not left set to false MB-43453: mcctl: Use passwd from env or stdin MB-40531: [BP] Prefer paging from replicas if possible Change-Id: I9787c4ba94e2038790721e01d90f96ce038df99e
2 parents bfa0dd8 + 0df2087 commit 35086bc

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)