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 5D1AA105DB for ; Mon, 23 Feb 2015 14:58:34 +0000 (UTC) Received: (qmail 15921 invoked by uid 500); 23 Feb 2015 14:58:34 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 15874 invoked by uid 500); 23 Feb 2015 14:58:34 -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 15865 invoked by uid 99); 23 Feb 2015 14:58:34 -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; Mon, 23 Feb 2015 14:58:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E12A8E084F; Mon, 23 Feb 2015 14:58:33 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kxepal@apache.org To: commits@couchdb.apache.org Message-Id: <4f7527116ccb44ce85424703fa023d3d@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: couch commit: updated refs/heads/master to d0e8d14 Date: Mon, 23 Feb 2015 14:58:33 +0000 (UTC) Repository: couchdb-couch Updated Branches: refs/heads/master 952a41c7a -> d0e8d1407 Fix nodes_db config option name Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/d0e8d140 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/d0e8d140 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/d0e8d140 Branch: refs/heads/master Commit: d0e8d140768e6d02e2aeb5171ce4f277e546a9cf Parents: 952a41c Author: Alexander Shorin Authored: Mon Feb 23 17:57:35 2015 +0300 Committer: Alexander Shorin Committed: Mon Feb 23 17:57:35 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/d0e8d140/src/couch_server.erl ---------------------------------------------------------------------- diff --git a/src/couch_server.erl b/src/couch_server.erl index 3057f18..8d016cf 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", "shard_db", "nodes"), + NodesDbName = config:get("mem3", "nodes_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