diff options
| author | Adam Kocoloski <adam@cloudant.com> | 2011-08-15 15:45:15 -0400 |
|---|---|---|
| committer | Adam Kocoloski <adam@cloudant.com> | 2011-08-15 15:45:15 -0400 |
| commit | 6ffe1675dd7b004e48891956a6bdbe32899ce80c (patch) | |
| tree | 57326d9a498481e65bb0db38c66daf10896801f1 /apps/couch/src/couch_server.erl | |
| parent | 52ff89ff7996e839b9e2f91fd76184d362a8aeb0 (diff) | |
| parent | fdd1a5d0bc48b49b0df5c9217beff9574011283c (diff) | |
Merge branch '11554-merge-couchdb-1.1'
Diffstat (limited to 'apps/couch/src/couch_server.erl')
| -rw-r--r-- | apps/couch/src/couch_server.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/couch/src/couch_server.erl b/apps/couch/src/couch_server.erl index 4252a035..cfe0b5fc 100644 --- a/apps/couch/src/couch_server.erl +++ b/apps/couch/src/couch_server.erl @@ -80,6 +80,7 @@ check_dbname(#server{dbname_regexp=RegExp}, DbName) -> nomatch -> case DbName of "_users" -> ok; + "_replicator" -> ok; _Else -> {error, illegal_database_name} end; @@ -173,7 +174,7 @@ all_databases(Prefix) -> 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) |