summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Vatamaniuc <vatamane@apache.org>2016-10-04 10:32:46 -0400
committerNick Vatamaniuc <vatamane@apache.org>2016-10-04 10:32:46 -0400
commit92fa3b11ebb3d109eb711a02972adbbf0468c2a1 (patch)
tree5e06e402f9887fb5a6df45319198ee009d368777
parent8d6b9c0a3955b62e613bf9e9e7b78e06ccfa542c (diff)
downloadcouchdb-92fa3b11ebb3d109eb711a02972adbbf0468c2a1.tar.gz
Replicator bump. Add 413 response handling for replicator.
Jira: COUCHDB-3168
-rw-r--r--rebar.config.script2
-rw-r--r--rel/overlay/etc/default.ini3
2 files changed, 3 insertions, 2 deletions
diff --git a/rebar.config.script b/rebar.config.script
index cd238c023..0963fca4f 100644
--- a/rebar.config.script
+++ b/rebar.config.script
@@ -32,7 +32,7 @@ DepDescs = [
{couch, "couch", "a468b0db6f1a9795b32e26c34b340df4d51f31b0"},
{couch_index, "couch-index", "53555fd909d5dd3d4a610c3fd6795950a8f7d022"},
{couch_mrview, "couch-mrview", "a0b0392afe66ece9ef3bb4fdd5a4f159c97c47eb"},
-{couch_replicator, "couch-replicator", "b9232c8d410d529d65030896e075c4b4327631b0"},
+{couch_replicator, "couch-replicator", "93c4ceaf97f46e0dd0fcc1deffe966263eda67d3"},
{couch_plugins, "couch-plugins", "3e73b723cb126cfc471b560d17c24a8b5c540085"},
{couch_event, "couch-event", "7e382132219d708239306aa3591740694943d367"},
{couch_stats, "couch-stats", "7895d4d3f509ed24f09b6d1a0bd0e06af34551dc"},
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 043c99ff3..e6ca15e8d 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -8,7 +8,8 @@ database_dir = {{data_dir}}
view_index_dir = {{view_index_dir}}
; util_driver_dir =
; plugin_dir =
-max_document_size = 67108864 ; 64 MB
+; max_document_size = 67108864 ; 64 MB
+max_document_size = 5000
os_process_timeout = 5000 ; 5 seconds. for view and external servers.
max_dbs_open = 500
delayed_commits = false