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

jan pushed a commit to branch 1198-no-5986-fauxton
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 47b044d3ce010a483f0028dbcc0ea2656ea78a5b
Merge: 6e6f152 42aba99
Author: Jan Lehnardt <j...@apache.org>
AuthorDate: Tue Mar 6 11:07:51 2018 +0100

    Merge branch 'master' into 1198-no-5986-fauxton

 rel/overlay/etc/default.ini                        |  23 +-
 src/couch/src/couch_bt_engine.erl                  |   5 +-
 src/couch/src/couch_compaction_daemon.erl          |  11 +-
 src/couch/src/couch_db.erl                         |  13 +-
 src/couch/test/couchdb_compaction_daemon_tests.erl |   1 +
 src/couch_index/src/couch_index.erl                |   6 +-
 .../{src => include}/couch_replicator_api_wrap.hrl |  13 +-
 src/couch_replicator/src/couch_replicator.erl      |   2 +-
 .../src/couch_replicator_api_wrap.erl              |   7 +-
 src/couch_replicator/src/couch_replicator_auth.erl |  99 +++
 .../src/couch_replicator_auth_noop.erl             |  52 ++
 .../src/couch_replicator_auth_session.erl          | 692 +++++++++++++++++++++
 .../src/couch_replicator_changes_reader.erl        |   2 +-
 src/couch_replicator/src/couch_replicator_docs.erl |  33 +-
 .../src/couch_replicator_httpc.erl                 |  59 +-
 src/couch_replicator/src/couch_replicator_ids.erl  |  51 +-
 .../src/couch_replicator_scheduler.erl             |   2 +-
 .../src/couch_replicator_scheduler_job.erl         |   2 +-
 .../src/couch_replicator_utils.erl                 |  90 ++-
 .../src/couch_replicator_worker.erl                |   2 +-
 .../test/couch_replicator_proxy_tests.erl          |   2 +-
 ...ch_replicator_small_max_request_size_target.erl |  28 +-
 22 files changed, 1036 insertions(+), 159 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
j...@apache.org.

Reply via email to