diff options
| author | Robert Newson <robert.newson@cloudant.com> | 2011-06-22 15:10:13 -0400 |
|---|---|---|
| committer | Robert Newson <robert.newson@cloudant.com> | 2011-06-22 15:10:13 -0400 |
| commit | e2e9e07398c9697a13f6db36ed9d0403fa6c89f1 (patch) | |
| tree | 39faca2adc29ad57c0084c942f1c2eb6ba08774d /apps/couch/src/couch_view.erl | |
| parent | ca738083b0a5053a1402b8eac55d6228b6e952b2 (diff) | |
| parent | d8dc16093a26c53407d8bf702698848104ba01d6 (diff) | |
Merge remote-tracking branch 'upstream/1.1.x' into 0.4.x
Conflicts:
acinclude.m4.in
apps/couch/src/couch_app.erl
apps/couch/src/couch_doc.erl
apps/couch/src/couch_view.erl
configure.ac
share/www/script/test/replicator_db.js
src/erlang-oauth/Makefile.am
test/etap/Makefile.am
Diffstat (limited to 'apps/couch/src/couch_view.erl')
| -rw-r--r-- | apps/couch/src/couch_view.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/couch/src/couch_view.erl b/apps/couch/src/couch_view.erl index 2d84b0f9..05174245 100644 --- a/apps/couch/src/couch_view.erl +++ b/apps/couch/src/couch_view.erl @@ -97,8 +97,8 @@ cleanup_index_files(Db) -> if length(Sigs) =:= 0 -> FileList; true -> - % regex that matches all ddocs - RegExp = "("++ string:join(Sigs, "|") ++")", + % regex that matches all ddocs + RegExp = "("++ string:join(Sigs, "|") ++")", % filter out the ones in use [FilePath || FilePath <- FileList, |