You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/02/26 21:31:48 UTC
[1/3] chttpd commit: updated refs/heads/master to 7f785ea
Repository: couchdb-chttpd
Updated Branches:
refs/heads/master 2a583cb0d -> 7f785ea57
Add underscore prefix for dbs database name
That's how we name system databases and there should be no exceptions.
COUCHDB-2619
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/7fef96e0
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/7fef96e0
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/7fef96e0
Branch: refs/heads/master
Commit: 7fef96e011af4200b2a98db9e40ac23ebe21ac78
Parents: 2a583cb
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Feb 26 00:39:45 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Feb 26 00:39:45 2015 +0300
----------------------------------------------------------------------
src/chttpd_misc.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/7fef96e0/src/chttpd_misc.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_misc.erl b/src/chttpd_misc.erl
index c87c5bc..5708708 100644
--- a/src/chttpd_misc.erl
+++ b/src/chttpd_misc.erl
@@ -100,7 +100,7 @@ handle_sleep_req(Req) ->
handle_all_dbs_req(#httpd{method='GET'}=Req) ->
Args = couch_mrview_http:parse_params(Req, undefined),
- ShardDbName = config:get("mem3", "shard_db", "dbs"),
+ ShardDbName = config:get("mem3", "shard_db", "_dbs"),
%% shard_db is not sharded but mem3:shards treats it as an edge case
%% so it can be pushed thru fabric
{ok, Info} = fabric:get_db_info(ShardDbName),
[3/3] chttpd commit: updated refs/heads/master to 7f785ea
Posted by kx...@apache.org.
Merge remote-tracking branch 'kxepal/rename-system-databases'
This closes #27
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/7f785ea5
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/7f785ea5
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/7f785ea5
Branch: refs/heads/master
Commit: 7f785ea5742d663998bfff04121bdb6f4706f883
Parents: 2a583cb 6c4aa04
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Feb 26 23:23:38 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Feb 26 23:23:38 2015 +0300
----------------------------------------------------------------------
src/chttpd_misc.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] chttpd commit: updated refs/heads/master to 7f785ea
Posted by kx...@apache.org.
Rename "shard_db" option to "shards_db"
COUCHDB-2628
Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/6c4aa04e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/6c4aa04e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/6c4aa04e
Branch: refs/heads/master
Commit: 6c4aa04e21cc94c4e2d1c9718a52d5fbffb58b73
Parents: 7fef96e
Author: Alexander Shorin <kx...@apache.org>
Authored: Thu Feb 26 21:55:25 2015 +0300
Committer: Alexander Shorin <kx...@apache.org>
Committed: Thu Feb 26 21:57:10 2015 +0300
----------------------------------------------------------------------
src/chttpd_misc.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/blob/6c4aa04e/src/chttpd_misc.erl
----------------------------------------------------------------------
diff --git a/src/chttpd_misc.erl b/src/chttpd_misc.erl
index 5708708..6423a91 100644
--- a/src/chttpd_misc.erl
+++ b/src/chttpd_misc.erl
@@ -100,7 +100,7 @@ handle_sleep_req(Req) ->
handle_all_dbs_req(#httpd{method='GET'}=Req) ->
Args = couch_mrview_http:parse_params(Req, undefined),
- ShardDbName = config:get("mem3", "shard_db", "_dbs"),
+ ShardDbName = config:get("mem3", "shards_db", "_dbs"),
%% shard_db is not sharded but mem3:shards treats it as an edge case
%% so it can be pushed thru fabric
{ok, Info} = fabric:get_db_info(ShardDbName),