summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2010-10-27 18:56:20 +0000
committerRobert Newson <rnewson@apache.org>2010-10-27 18:56:20 +0000
commit5e61c678a9fcbe91e9e84931d0bb7b6ada10a965 (patch)
treecb066f44b8dfe7814448dee06a068fb03f486b0f /src
parentaf75a3f4434a402b373e54c91e5f2c00ddbb49d7 (diff)
sort _all_dbs at api not http level.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@1028070 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_httpd_misc_handlers.erl2
-rw-r--r--src/couchdb/couch_server.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/couchdb/couch_httpd_misc_handlers.erl b/src/couchdb/couch_httpd_misc_handlers.erl
index dafc6f39..70db79f6 100644
--- a/src/couchdb/couch_httpd_misc_handlers.erl
+++ b/src/couchdb/couch_httpd_misc_handlers.erl
@@ -66,7 +66,7 @@ handle_utils_dir_req(Req, _) ->
handle_all_dbs_req(#httpd{method='GET'}=Req) ->
{ok, DbNames} = couch_server:all_databases(),
- send_json(Req, lists:usort(DbNames));
+ send_json(Req, DbNames);
handle_all_dbs_req(Req) ->
send_method_not_allowed(Req, "GET,HEAD").
diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl
index 2d96d5f3..7870d69e 100644
--- a/src/couchdb/couch_server.erl
+++ b/src/couchdb/couch_server.erl
@@ -168,7 +168,7 @@ all_databases() ->
end,
[list_to_binary(filename:rootname(RelativeFilename, ".couch")) | AccIn]
end, []),
- {ok, Filenames}.
+ {ok, lists:usort(Filenames)}.
maybe_close_lru_db(#server{dbs_open=NumOpen, max_dbs_open=MaxOpen}=Server)