Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9AAC31130C for ; Tue, 6 May 2014 15:26:28 +0000 (UTC) Received: (qmail 18829 invoked by uid 500); 6 May 2014 15:01:05 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 18794 invoked by uid 500); 6 May 2014 15:01:05 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 18774 invoked by uid 99); 6 May 2014 15:01:05 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 May 2014 15:01:05 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 128D1935647; Tue, 6 May 2014 15:01:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org Message-Id: <969154defcc242178fe9f6fd2e062670@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couch commit: updated refs/heads/master to 60a3d29 Date: Tue, 6 May 2014 15:01:05 +0000 (UTC) Repository: couchdb-couch Updated Branches: refs/heads/master 9d629ff64 -> 60a3d29be Remove last remnants of reverted prompt_many work Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/60a3d29b Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/60a3d29b Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/60a3d29b Branch: refs/heads/master Commit: 60a3d29beeaed82be21463e1e7012305fe711253 Parents: 9d629ff Author: Robert Newson Authored: Tue May 6 16:00:07 2014 +0100 Committer: Robert Newson Committed: Tue May 6 16:00:07 2014 +0100 ---------------------------------------------------------------------- include/couch_db.hrl | 1 - src/couch_proc_manager.erl | 1 - 2 files changed, 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/60a3d29b/include/couch_db.hrl ---------------------------------------------------------------------- diff --git a/include/couch_db.hrl b/include/couch_db.hrl index 1fa16f2..90cc263 100644 --- a/include/couch_db.hrl +++ b/include/couch_db.hrl @@ -245,7 +245,6 @@ client = nil, ddoc_keys = [], prompt_fun, - prompt_many_fun, set_timeout_fun, stop_fun }). http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/60a3d29b/src/couch_proc_manager.erl ---------------------------------------------------------------------- diff --git a/src/couch_proc_manager.erl b/src/couch_proc_manager.erl index c8a5b77..a0fc5c2 100644 --- a/src/couch_proc_manager.erl +++ b/src/couch_proc_manager.erl @@ -317,7 +317,6 @@ make_proc(Pid, Lang, Mod) -> lang = Lang, pid = Pid, prompt_fun = {Mod, prompt}, - prompt_many_fun = {Mod, prompt_many}, set_timeout_fun = {Mod, set_timeout}, stop_fun = {Mod, stop} },