You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by dc...@apache.org on 2013/06/25 18:23:03 UTC
[2/2] git commit: updated
refs/heads/1833-feature-r16b01-with-mochiweb-backport to e055424
Merge branch 'refs/heads/1696-backport-mochiweb-2-4-2-1.3.x' into 1.3.x
- support Erlang/OTP R16B and R16B01 releases
- see COUCHDB-1696 and COUCHDB-1833 respectively
Conflicts:
share/doc/src/changelog.rst
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/e0554249
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/e0554249
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/e0554249
Branch: refs/heads/1833-feature-r16b01-with-mochiweb-backport
Commit: e05542490d180e9ab1bfcaeb362ebebb79522705
Parents: 5f4a26a 6170654
Author: Dave Cottlehuber <dc...@apache.org>
Authored: Tue Jun 25 17:08:27 2013 +0200
Committer: Dave Cottlehuber <dc...@apache.org>
Committed: Tue Jun 25 17:08:27 2013 +0200
----------------------------------------------------------------------
CHANGES | 1 +
NEWS | 3 +-
NOTICE | 4 +
configure.ac | 4 +-
share/doc/src/changelog.rst | 15 +-
src/couchdb/couch_app.erl | 2 +-
src/mochiweb/Makefile.am | 6 +-
src/mochiweb/mochifmt_records.erl | 2 +
src/mochiweb/mochifmt_std.erl | 2 +
src/mochiweb/mochiweb_request.erl | 2 +
src/mochiweb/mochiweb_response.erl | 2 +
src/mochiweb/pmod_pt.erl | 463 ++++++++++++++++++++++++++++++++
test/etap/120-stats-collect.t | 14 +-
13 files changed, 507 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e0554249/CHANGES
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/e0554249/share/doc/src/changelog.rst
----------------------------------------------------------------------
diff --cc share/doc/src/changelog.rst
index b933b9a,4fea3cc..ff6eca4
--- a/share/doc/src/changelog.rst
+++ b/share/doc/src/changelog.rst
@@@ -43,6 -43,6 +43,19 @@@ CouchDB 1.0.x release
CouchDB 1.0.x you must back up your data files before performing the
upgrade and compaction process.
++Version 1.3.2
++-------------
++
++This version has not been released yet.
++
++Build System
++^^^^^^^^^^^^
++
++* :issue:`1696`: Add support for Erlang R16B through pmod-transform library.
++ :commit:`50e5b1e`
++* :issue:`1833`: Support Erlang R16B01.
++ :commit:`01afaa4f`
++
Version 1.3.1
-------------
@@@ -68,8 -62,9 +81,8 @@@ Miscellaneou
^^^^^^^^^^^^^
* Improve documentation: better structure, improve language, less duplication.
+* :issue:`1784`: Improvements to test suite and VPATH build system.
- :commit:`01afaa4f`
+ * Improvements to test suite.
-* :issue`1696`: Add support for Erlang R16B through pmod-transform library.
- :commit:`50e5b1e`
Version 1.3.0
-------------