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 3C005175B5 for ; Tue, 2 Jun 2015 19:35:35 +0000 (UTC) Received: (qmail 35678 invoked by uid 500); 2 Jun 2015 19:35:33 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 35481 invoked by uid 500); 2 Jun 2015 19:35:33 -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 34653 invoked by uid 99); 2 Jun 2015 19:35:32 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Jun 2015 19:35:32 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 80022E0D5B; Tue, 2 Jun 2015 19:35:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: chewbranca@apache.org To: commits@couchdb.apache.org Date: Tue, 02 Jun 2015 19:35:49 -0000 Message-Id: In-Reply-To: <1b227edc773e4cbabd298c26188e5f92@git.apache.org> References: <1b227edc773e4cbabd298c26188e5f92@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/50] couch commit: updated refs/heads/2080-port-cors-to-chttpd to 529339b s/nodes_db/node_db/ - singular form Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/635ecaee Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/635ecaee Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/635ecaee Branch: refs/heads/2080-port-cors-to-chttpd Commit: 635ecaeec7994d1ecad082293b4a5090d1fd0474 Parents: d0e8d14 Author: Alexander Shorin Authored: Wed Feb 25 21:33:48 2015 +0300 Committer: Alexander Shorin Committed: Wed Feb 25 21:33:48 2015 +0300 ---------------------------------------------------------------------- src/couch_server.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/635ecaee/src/couch_server.erl ---------------------------------------------------------------------- diff --git a/src/couch_server.erl b/src/couch_server.erl index 8d016cf..5350e0f 100644 --- a/src/couch_server.erl +++ b/src/couch_server.erl @@ -120,7 +120,7 @@ maybe_add_sys_db_callbacks(DbName, Options) when is_binary(DbName) -> maybe_add_sys_db_callbacks(?b2l(DbName), Options); maybe_add_sys_db_callbacks(DbName, Options) -> DbsDbName = config:get("mem3", "shard_db", "dbs"), - NodesDbName = config:get("mem3", "nodes_db", "nodes"), + NodesDbName = config:get("mem3", "node_db", "nodes"), IsReplicatorDb = DbName == config:get("replicator", "db", "_replicator") orelse path_ends_with(DbName, <<"_replicator">>), IsUsersDb = DbName ==config:get("couch_httpd_auth", "authentication_db", "_users") orelse