You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2018/07/17 06:45:38 UTC
[couchdb] branch test/erlang-request-retry-after-wait updated
(6deea1b -> 1b567fa)
This is an automated email from the ASF dual-hosted git repository.
jan pushed a change to branch test/erlang-request-retry-after-wait
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from 6deea1b Merge branch 'master' into test/erlang-request-retry-after-wait
add 3acf15f Make MD5 hash implementation configurable (#1171)
add 79eb1af Report git sha on welcome request
add 1d69790 Improve detection of git tags/dirty status
new 1b567fa Merge branch 'master' into test/erlang-request-retry-after-wait
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:
Makefile | 45 +++++++++++++++----
Makefile.win | 45 +++++++++++++++++--
build-aux/couchdb-build-release.sh | 6 ++-
configure | 9 ++++
src/chttpd/src/chttpd.erl | 2 +-
src/chttpd/src/chttpd_misc.erl | 1 +
src/chttpd/test/chttpd_welcome_test.erl | 2 +
src/couch/rebar.config.script | 17 +++++++-
src/couch/src/couch_bt_engine.erl | 2 +-
src/couch/src/couch_db.erl | 2 +-
src/couch/src/couch_file.erl | 8 ++--
src/couch/src/{couch_rand.erl => couch_hash.erl} | 50 ++++++++--------------
src/couch/src/couch_httpd.erl | 2 +-
src/couch/src/couch_native_process.erl | 4 +-
src/couch/src/couch_server.erl | 3 +-
src/couch/src/couch_stream.erl | 18 ++++----
src/couch/src/test_engine_util.erl | 8 ++--
src/couch/test/couchdb_attachments_tests.erl | 6 +--
src/couch_epi/src/couch_epi_data.erl | 2 +-
src/couch_epi/src/couch_epi_util.erl | 2 +-
.../test/couch_index_ddoc_updated_tests.erl | 2 +-
src/couch_mrview/src/couch_mrview.erl | 2 +-
src/couch_mrview/src/couch_mrview_util.erl | 8 ++--
src/couch_replicator/src/couch_replicator_ids.erl | 2 +-
.../test/couch_replicator_many_leaves_tests.erl | 2 +-
.../test/couch_replicator_test_helper.erl | 12 +++---
src/mem3/src/mem3_rep.erl | 6 +--
27 files changed, 177 insertions(+), 91 deletions(-)
copy src/couch/src/{couch_rand.erl => couch_hash.erl} (50%)
[couchdb] 01/01: Merge branch 'master' into
test/erlang-request-retry-after-wait
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jan pushed a commit to branch test/erlang-request-retry-after-wait
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 1b567fa7d7bd01f07dc39d1c33b02641984bef38
Merge: 6deea1b 1d69790
Author: Jan Lehnardt <ja...@apache.org>
AuthorDate: Tue Jul 17 08:45:36 2018 +0200
Merge branch 'master' into test/erlang-request-retry-after-wait
Makefile | 45 ++++++++++++++++++----
Makefile.win | 45 ++++++++++++++++++++--
build-aux/couchdb-build-release.sh | 6 ++-
configure | 9 +++++
src/chttpd/src/chttpd.erl | 2 +-
src/chttpd/src/chttpd_misc.erl | 1 +
src/chttpd/test/chttpd_welcome_test.erl | 2 +
src/couch/rebar.config.script | 17 +++++++-
src/couch/src/couch_bt_engine.erl | 2 +-
src/couch/src/couch_db.erl | 2 +-
src/couch/src/couch_file.erl | 8 ++--
src/couch/src/couch_hash.erl | 45 ++++++++++++++++++++++
src/couch/src/couch_httpd.erl | 2 +-
src/couch/src/couch_native_process.erl | 4 +-
src/couch/src/couch_server.erl | 3 +-
src/couch/src/couch_stream.erl | 18 ++++-----
src/couch/src/test_engine_util.erl | 8 ++--
src/couch/test/couchdb_attachments_tests.erl | 6 +--
src/couch_epi/src/couch_epi_data.erl | 2 +-
src/couch_epi/src/couch_epi_util.erl | 2 +-
.../test/couch_index_ddoc_updated_tests.erl | 2 +-
src/couch_mrview/src/couch_mrview.erl | 2 +-
src/couch_mrview/src/couch_mrview_util.erl | 8 ++--
src/couch_replicator/src/couch_replicator_ids.erl | 2 +-
.../test/couch_replicator_many_leaves_tests.erl | 2 +-
.../test/couch_replicator_test_helper.erl | 12 +++---
src/mem3/src/mem3_rep.erl | 6 +--
27 files changed, 203 insertions(+), 60 deletions(-)