summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Slater <nslater@apache.org>2013-05-28 21:03:03 +0100
committerNoah Slater <nslater@apache.org>2013-05-28 21:03:03 +0100
commit06b9aa50abdb572a98e44cfff4b7e89bf01e2fbc (patch)
treea2154dccd7cf05091d2793fc81c7be57899478e9
parentcd42fa02b994f332f925685240290c1d3612b8fb (diff)
downloadcouchdb-06b9aa50abdb572a98e44cfff4b7e89bf01e2fbc.tar.gz
Forward port 1.3.1 changes
-rw-r--r--CHANGES27
-rw-r--r--NEWS16
-rw-r--r--share/doc/src/changelog.rst28
3 files changed, 47 insertions, 24 deletions
diff --git a/CHANGES b/CHANGES
index 08cb16036..fd8187b13 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,29 +20,26 @@ Apache CouchDB CHANGES
# * Bump Mochiweb dependency to v2.4.2.
# * Minimum Erlang/OTP version is now R14B.
-# Version 1.3.1
-# -------------
-#
-# This version has not been released yet.
+Version 1.3.1
+-------------
-# Replicator:
+Replicator:
-# * Tolerate missing source and target fields in _replicator docs
- (COUCHDB-1788).
+ * Tolerate missing source and target fields in _replicator docs (COUCHDB-1788).
-# Log System:
+Log System:
-# * Don't log about missing .compact files.
-# * Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
+ * Don't log about missing .compact files.
+ * Fix bug in WARN level logging from 1.3.0 (COUCHDB-1794).
-# View Server:
+View Server:
-# * Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
+ * Fix the -S option to couchjs to increase memory limits (COUCHDB-1792).
-# Misc:
+Misc:
-# * Improve documentation: better structure, improve language, less duplication.
-# * Improvements to test suite and VPATH build system.
+ * Improve documentation: better structure, improve language, less duplication.
+ * Improvements to test suite and VPATH build system.
Version 1.3.0
-------------
diff --git a/NEWS b/NEWS
index efa79aaf4..ee45effba 100644
--- a/NEWS
+++ b/NEWS
@@ -16,16 +16,14 @@ Each release section notes when backwards incompatible changes have been made.
# * Bump Mochiweb dependency to v2.4.2.
# * Minimum Erlang/OTP version is now R14B.
-# Version 1.3.1
-# -------------
-#
-# This version has not been released yet.
+Version 1.3.1
+-------------
-# * Tolerate missing source and target fields in _replicator docs.
-# * Don't log about missing .compact files.
-# * Fix bug in WARN level logging from 1.3.0.
-# * Improve documentation: better structure, improve language, less duplication.
-# * Improvements to test suite.
+ * Tolerate missing source and target fields in _replicator docs.
+ * Don't log about missing .compact files.
+ * Fix bug in WARN level logging from 1.3.0.
+ * Improve documentation: better structure, improve language, less duplication.
+ * Improvements to test suite.
Version 1.3.0
-------------
diff --git a/share/doc/src/changelog.rst b/share/doc/src/changelog.rst
index 2f2334dc1..b933b9a78 100644
--- a/share/doc/src/changelog.rst
+++ b/share/doc/src/changelog.rst
@@ -43,6 +43,34 @@ 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.1
+-------------
+
+Replicator
+^^^^^^^^^^
+
+* :issue:`1788`: Tolerate missing source and target fields in _replicator docs.
+ :commit:`869f42e2`
+
+Log System
+^^^^^^^^^^
+
+* Don't log about missing .compact files. :commit:`06f1a8dc`
+* :issue:`1794`: Fix bug in WARN level logging from 1.3.0.
+
+View Server
+^^^^^^^^^^^
+
+* :issue:`1792`: Fix the -S option to couchjs to increase memory limits.
+ :commit:`cfaa66cd`
+
+Miscellaneous
+^^^^^^^^^^^^^
+
+* Improve documentation: better structure, improve language, less duplication.
+* :issue:`1784`: Improvements to test suite and VPATH build system.
+ :commit:`01afaa4f`
+
Version 1.3.0
-------------