couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rnew...@apache.org
Subject [42/50] [abbrv] git commit: updated refs/heads/1843-feature-bigcouch to cba2e81
Date Sat, 29 Jun 2013 15:18:23 GMT
[squash] to somwhere Mark the dbs db as a sys_db

Not sure where


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

Branch: refs/heads/1843-feature-bigcouch
Commit: 06475babece2f3dfff72df81006bd3288d63af4c
Parents: f9da28e
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Wed Mar 13 12:57:16 2013 -0500
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Wed Mar 20 06:02:56 2013 -0500

----------------------------------------------------------------------
 src/couch/src/couch_server.erl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/06475bab/src/couch/src/couch_server.erl
----------------------------------------------------------------------
diff --git a/src/couch/src/couch_server.erl b/src/couch/src/couch_server.erl
index 3d4a1a6..80448b1 100644
--- a/src/couch/src/couch_server.erl
+++ b/src/couch/src/couch_server.erl
@@ -125,7 +125,12 @@ maybe_add_sys_db_callbacks(DbName, Options) ->
             sys_db | Options
         ];
         _ ->
-            Options
+            case config:get("mem3", "shard_db", "dbs") of
+            DbName ->
+                [sys_db | Options];
+            _ ->
+                Options
+            end
         end
     end.
 


Mime
View raw message