couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject couch commit: updated refs/heads/windsor-merge to 1f1c8e1
Date Mon, 11 Aug 2014 20:03:55 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/windsor-merge a46c03873 -> 1f1c8e1c0


Remove duplicate couch_replicator processes

These are started by the couch_replicator application now.


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

Branch: refs/heads/windsor-merge
Commit: 1f1c8e1c03cca683973cdd9ed8b63f55c4f1994e
Parents: a46c038
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Mon Aug 11 15:02:33 2014 -0500
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Mon Aug 11 15:02:33 2014 -0500

----------------------------------------------------------------------
 src/couch_primary_sup.erl | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/1f1c8e1c/src/couch_primary_sup.erl
----------------------------------------------------------------------
diff --git a/src/couch_primary_sup.erl b/src/couch_primary_sup.erl
index cbd576d..dc2d9e5 100644
--- a/src/couch_primary_sup.erl
+++ b/src/couch_primary_sup.erl
@@ -36,19 +36,7 @@ init([]) ->
             permanent,
             brutal_kill,
             worker,
-            [couch_server]},
-        {couch_replication_event,
-            {gen_event, start_link, [{local, couch_replication}]},
-            permanent,
-            brutal_kill,
-            worker,
-            dynamic},
-        {couch_replicator_job_sup,
-            {couch_replicator_job_sup, start_link, []},
-            permanent,
-            infinity,
-            supervisor,
-            [couch_replicator_job_sup]}
+            [couch_server]}
     ],
     {ok, {{one_for_one, 10, 3600}, Children}}.
 


Mime
View raw message