diff options
| author | Robert Newson <robert.newson@cloudant.com> | 2011-10-31 18:36:54 +0000 |
|---|---|---|
| committer | Robert Newson <robert.newson@cloudant.com> | 2011-10-31 18:54:51 +0000 |
| commit | 8bbd833f866c8dfdaaf06f3dc5a5ca06030504e8 (patch) | |
| tree | c5da36c09f33c689a70d99480327140362031d8e /apps | |
| parent | a6352493651f6f8e3430269555421b5599a77809 (diff) | |
| parent | af7a6ae52890c6c158615068f2a48d40c52ec538 (diff) | |
Merge commit '1.1.1' into 0.4.x
Conflicts:
acinclude.m4.in
configure.ac
couchjs/c_src/http.c
src/erlang-oauth/Makefile.am
src/erlang-oauth/oauth.app.in
src/erlang-oauth/oauth_hmac_sha1.erl
src/erlang-oauth/oauth_http.erl
src/erlang-oauth/oauth_plaintext.erl
src/etap/etap_web.erl
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/couch/CHANGES | 4 | ||||
| -rw-r--r-- | apps/couch/NEWS | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/apps/couch/CHANGES b/apps/couch/CHANGES index 0c619ab9..8e89305f 100644 --- a/apps/couch/CHANGES +++ b/apps/couch/CHANGES @@ -4,8 +4,7 @@ Apache CouchDB CHANGES Version 1.1.1 ------------- -This version has not been released yet. - +* Support SpiderMonkey 1.8.5 * Add configurable maximum to the number of bytes returned by _log. * Allow CommonJS modules to be an empty string. * Bump minimum Erlang version to R13B02. @@ -29,6 +28,7 @@ This version has not been released yet. * Fix replication crash when source database has a document with empty ID. * Fix deadlock when assigning couchjs processes to serve requests. * Fixes to the document multipart PUT API. +* Fixes regarding file descriptor leaks for databases with views. Version 1.1.0 ------------- diff --git a/apps/couch/NEWS b/apps/couch/NEWS index 13e6ac56..e62289ed 100644 --- a/apps/couch/NEWS +++ b/apps/couch/NEWS @@ -10,8 +10,7 @@ Each release section notes when backwards incompatible changes have been made. Version 1.1.1 ------------- -This version has not been released yet. - +* Support SpiderMonkey 1.8.5 * Add configurable maximum to the number of bytes returned by _log. * Allow CommonJS modules to be an empty string. * Bump minimum Erlang version to R13B02. @@ -35,6 +34,7 @@ This version has not been released yet. * Fix replication crash when source database has a document with empty ID. * Fix deadlock when assigning couchjs processes to serve requests. * Fixes to the document multipart PUT API. +* Fixes regarding file descriptor leaks for databases with views. Version 1.1.0 ------------- |