You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2017/10/11 18:07:53 UTC
[couchdb] 01/01: Merge branch 'master' into fix-ddoc-cache-upgrade
This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch fix-ddoc-cache-upgrade
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit db7226eaf006679cda2e739388141fbe3832525d
Merge: 74c22ad a99cc6f
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Wed Oct 11 13:07:48 2017 -0500
Merge branch 'master' into fix-ddoc-cache-upgrade
rel/overlay/etc/default.ini | 5 +-
src/couch/rebar.config.script | 2 +
src/couch/src/couch_auth_cache.erl | 5 +-
src/couch/src/couch_lru.erl | 4 +-
src/couch/src/couch_util.erl | 15 +
src/couch/src/couch_uuids.erl | 105 +++++--
src/couch/src/test_util.erl | 2 +-
src/couch_epi/test/couch_epi_tests.erl | 2 +-
src/couch_peruser/README.md | 19 +-
src/couch_peruser/src/couch_peruser.app.src | 6 +-
src/couch_peruser/src/couch_peruser.erl | 312 +++++++++++++++------
...couch_peruser.app.src => couch_peruser_app.erl} | 22 +-
...couch_peruser.app.src => couch_peruser_sup.erl} | 25 +-
src/couch_peruser/test/couch_peruser_test.erl | 19 ++
src/couch_replicator/src/couch_replicator.erl | 2 +-
.../src/couch_replicator_clustering.erl | 10 +-
.../src/couch_replicator_worker.erl | 10 +-
src/fabric/src/fabric_db_create.erl | 2 +-
src/mango/src/mango_execution_stats.erl | 6 +-
src/mem3/src/mem3.erl | 8 +-
src/mem3/src/mem3_shards.erl | 4 +-
src/rexi/src/rexi_server.erl | 2 +-
test/build/test-run-couch-for-mango.sh | 13 +-
23 files changed, 454 insertions(+), 146 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.