Merge pull request #1285 from wiredtiger/release-2.4.02.4.0

Add changelog for 2.4.0

8 files changed, 84 insertions, 12 deletions

diff --git a/NEWS b/NEWS
index 0d3ce71a376..ada8144c3c3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,66 @@
+WiredTiger release 2.4.0, 2014-10-15
+------------------------------------
+
+The WiredTiger 2.4.0 release contains significant new features, API changes
+and many bug fixes.
+
+New features and API changes:
+
+* Cursors keep their position across transaction boundaries. That is
+  WT_SESSION::begin_transaction and WT_SESSION::commit_transaction no longer
+  reset cursors. [#1181]
+
+* Change cursor behavior so that when an operation returns WT_NOTFOUND, the
+  cursor is now left pointing to the original key/value pair. [#1209]
+
+* Initial support for building WiredTiger on Windows.
+
+* Add ability to customize a collator for specific data sources or with
+  application managed metadata. See upgrading documentation for more
+  information. [#1165]
+
+* Enhance extension mechanism in WiredTiger to support loading extensions from
+  the application binary - not just a separate library. [#1174]
+
+* Replace WT_SESSION::create "lsm=(merge_threads)" configuration option with
+  ::wiredtiger_open "lsm_manager=(worker_thread_max)". See upgrading documentation
+  for more information.
+
+* Enhancements to the WiredTiger Python API build process. [#1188]
+
+* Add ability to dump and load WiredTiger databases in JSON format. [#1154]
+
+* Add ability to automatically checkpoint based on the volume of log records
+  generated since the last checkpoint.  This is enabled using the
+  ::wiredtiger_open configuration option "checkpoint=(log_size=size)" [#1170]
+
+* Enhance functionality allowing users to write content into the WiredTiger
+  transaction log. [#1171][#1175]
+
+* Enhance the WiredTiger HyperLevelDB implementation to support log replay.
+  [#1106][#1155]
+
+Other significant changes:
+
+* Fix several bugs in the shared cache implementation. [#1180][#1176]
+
+* Fix a bug where the public URI field in a cursor did not match the string
+  passed to WT_SESSION::open_cursor. [#1235]
+
+* Fix several bugs in salvage. [#1222][#1169]
+
+* Several bug fixes and enhancements for WT_CONNECTION::reconfigure.
+  [#1214][#1172]
+
+* Fix several bugs in raw compression implementation, particularly for data
+  that compresses extremely well. [#1191]
+
+* Several bug fixes and enhancements to WiredTiger LevelDB interface.
+
+* Switch default build from using adaptive pthread mutexes to default pthread
+  mutexes.
+
+
 WiredTiger release 2.3.1, 2014-08-14
 ------------------------------------
 
diff --git a/README b/README
index f4a0edad364..5c7b470c3df 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
-WiredTiger 2.3.2: (August 14, 2014)
+WiredTiger 2.4.0: (October 16, 2014)
 
-This is version 2.3.2 of WiredTiger.
+This is version 2.4.0 of WiredTiger.
 
 WiredTiger release packages and documentation can be found at:
 
@@ -9,7 +9,7 @@ WiredTiger release packages and documentation can be found at:
 Information on configuring, building and installing WiredTiger can be
 found at:
 
-	http://source.wiredtiger.com/2.3.2/install.html
+	http://source.wiredtiger.com/2.4.0/install.html
 
 WiredTiger licensing information can be found at:
 
diff --git a/RELEASE_INFO b/RELEASE_INFO
index ae610872b6d..ea36c3271d5 100644
--- a/RELEASE_INFO
+++ b/RELEASE_INFO
@@ -1,6 +1,6 @@
 WIREDTIGER_VERSION_MAJOR=2
-WIREDTIGER_VERSION_MINOR=3
-WIREDTIGER_VERSION_PATCH=2
+WIREDTIGER_VERSION_MINOR=4
+WIREDTIGER_VERSION_PATCH=0
 WIREDTIGER_VERSION="$WIREDTIGER_VERSION_MAJOR.$WIREDTIGER_VERSION_MINOR.$WIREDTIGER_VERSION_PATCH"
 
 WIREDTIGER_RELEASE_DATE=`date "+%B %e, %Y"`
diff --git a/build_posix/aclocal/version-set.m4 b/build_posix/aclocal/version-set.m4
index 315cf95234f..fcdd48f203e 100644
--- a/build_posix/aclocal/version-set.m4
+++ b/build_posix/aclocal/version-set.m4
@@ -1,14 +1,14 @@
 dnl build by dist/s_version
 
 VERSION_MAJOR=2
-VERSION_MINOR=3
-VERSION_PATCH=2
-VERSION_STRING='"WiredTiger 2.3.2: (August 14, 2014)"'
+VERSION_MINOR=4
+VERSION_PATCH=0
+VERSION_STRING='"WiredTiger 2.4.0: (October 16, 2014)"'
 
 AC_SUBST(VERSION_MAJOR)
 AC_SUBST(VERSION_MINOR)
 AC_SUBST(VERSION_PATCH)
 AC_SUBST(VERSION_STRING)
 
-VERSION_NOPATCH=2.3
+VERSION_NOPATCH=2.4
 AC_SUBST(VERSION_NOPATCH)
diff --git a/build_posix/aclocal/version.m4 b/build_posix/aclocal/version.m4
index 4c70bdbae16..23f3110ae01 100644
--- a/build_posix/aclocal/version.m4
+++ b/build_posix/aclocal/version.m4
@@ -1,2 +1,2 @@
 dnl WiredTiger product version for AC_INIT.  Maintained by dist/s_version
-2.3.2
+2.4.0
diff --git a/dist/package/wiredtiger.spec b/dist/package/wiredtiger.spec
index 8f9bf79eda7..2179a975feb 100644
--- a/dist/package/wiredtiger.spec
+++ b/dist/package/wiredtiger.spec
@@ -1,5 +1,5 @@
 Name:		wiredtiger
-Version:	2.3.2
+Version:	2.4.0
 Release:	1%{?dist}
 Summary:	WiredTiger data storage engine
 
diff --git a/dist/s_copyright.list b/dist/s_copyright.list
index 34d096694b6..ed1d8a655f5 100644
--- a/dist/s_copyright.list
+++ b/dist/s_copyright.list
@@ -14,6 +14,8 @@ skip	dist/stat.py
 skip	dist/stat_data.py
 skip	dist/style.py
 skip	lang/java/java_doc.i
+skip	lang/java/src/com/wiredtiger/db/AsyncOp.java
+skip	lang/java/src/com/wiredtiger/db/AsyncOpType.java
 skip	lang/java/src/com/wiredtiger/db/Connection.java
 skip	lang/java/src/com/wiredtiger/db/Cursor.java
 skip	lang/java/src/com/wiredtiger/db/SearchStatus.java
diff --git a/src/docs/upgrading.dox b/src/docs/upgrading.dox
index e5fceac4ffa..71b666abdec 100644
--- a/src/docs/upgrading.dox
+++ b/src/docs/upgrading.dox
@@ -1,8 +1,15 @@
 /*! @page upgrading Upgrading WiredTiger applications
 
-@section version_232 Upgrading to Version 2.3.2
+@section version_240 Upgrading to Version 2.4.0
 
 <dl>
+<dt>Default configuration file changes</dt>
+<dd>
+WiredTiger creates a configuration file when a database is first created. This
+release adds a version number to that configuration file, and functionality
+to automatically translate configuration settings between versions moving
+forward.
+</dd>
 <dt>Cursors no longer reset on transaction begin or commit</dt>
 <dd>
 In previous versions of WiredTiger, all cursors in a session were reset at