You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2015/10/07 17:06:18 UTC

[1/2] couchdb commit: updated refs/heads/master to e710130

Repository: couchdb
Updated Branches:
  refs/heads/master 534797334 -> e710130b3


Set same uuid for all dev nodes


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e710130b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e710130b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e710130b

Branch: refs/heads/master
Commit: e710130b3946e984cc42e6226fcc2df09b89d77c
Parents: e9d5e92
Author: Robert Newson <rn...@apache.org>
Authored: Wed Oct 7 15:41:09 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Oct 7 16:06:02 2015 +0100

----------------------------------------------------------------------
 dev/run                     | 3 ++-
 rel/overlay/etc/default.ini | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e710130b/dev/run
----------------------------------------------------------------------
diff --git a/dev/run b/dev/run
index 4017167..147bead 100755
--- a/dev/run
+++ b/dev/run
@@ -171,7 +171,8 @@ def setup_configs(ctx):
             "node_name": "-name %s@127.0.0.1" % node,
             "cluster_port": cluster_port,
             "backend_port": backend_port,
-            "fauxton_root": "src/fauxton/dist/release"
+            "fauxton_root": "src/fauxton/dist/release",
+            "uuid": "fake_uuid_for_dev"
         }
         if os.name == 'nt':
             # Erlang always wants UNIX-style paths

http://git-wip-us.apache.org/repos/asf/couchdb/blob/e710130b/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 1125e28..bcababc 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -3,6 +3,7 @@
 name = {{package_author_name}}
 
 [couchdb]
+uuid = {{uuid}}
 database_dir = {{data_dir}}
 view_index_dir = {{view_index_dir}}
 ; util_driver_dir =


[2/2] couchdb commit: updated refs/heads/master to e710130

Posted by rn...@apache.org.
Disable replicator delay by default


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e9d5e928
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e9d5e928
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e9d5e928

Branch: refs/heads/master
Commit: e9d5e928e72259ac50f25b10bd39222e01af93bc
Parents: 5347973
Author: Robert Newson <rn...@apache.org>
Authored: Wed Oct 7 15:41:24 2015 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Wed Oct 7 16:06:02 2015 +0100

----------------------------------------------------------------------
 rel/overlay/etc/default.ini | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/e9d5e928/rel/overlay/etc/default.ini
----------------------------------------------------------------------
diff --git a/rel/overlay/etc/default.ini b/rel/overlay/etc/default.ini
index 454bc71..1125e28 100644
--- a/rel/overlay/etc/default.ini
+++ b/rel/overlay/etc/default.ini
@@ -259,6 +259,10 @@ compressible_types = text/*, application/javascript, application/json, applicati
 
 [replicator]
 db = _replicator
+; minimum time between a replicator job restart (milliseconds)
+start_delay = 0
+; random splay time between a replicator job restart (milliseconds)
+start_splay = 0
 ; Maximum replicaton retry count can be a non-negative integer or "infinity".
 max_replication_retry_count = 10
 ; More worker processes can give higher network throughput but can also