[couchdb] branch main updated (31e3f64e6 -> 762277f3d)

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git


    from 31e3f64e6 Merge pull request #4494 from jiahuili430/treat-key-as-keys
     add 5c99df170 allow configurable timeouts for _view and _search
     new 762277f3d Merge pull request #4513 from apache/configurable-timeouts

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/dreyfus/src/dreyfus_fabric_search.erl | 4 ++--
 src/fabric/src/fabric_util.erl            | 2 +-
 src/fabric/src/fabric_view_map.erl        | 2 +-
 src/fabric/src/fabric_view_reduce.erl     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

[couchdb] 01/01: Merge pull request #4513 from apache/configurable-timeouts

[rn...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 762277f3deb037e9f18d7d5f3f95759754d63e50
Merge: 31e3f64e6 5c99df170
Author: Robert Newson <rn...@apache.org>
AuthorDate: Wed Apr 5 22:10:37 2023 +0000

    Merge pull request #4513 from apache/configurable-timeouts
    
    allow configurable timeouts for _view and _search

 src/dreyfus/src/dreyfus_fabric_search.erl | 4 ++--
 src/fabric/src/fabric_util.erl            | 2 +-
 src/fabric/src/fabric_view_map.erl        | 2 +-
 src/fabric/src/fabric_view_reduce.erl     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)