summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@wiredtiger.com>2012-06-15 17:34:30 +1000
committerMichael Cahill <michael.cahill@wiredtiger.com>2012-06-15 17:34:30 +1000
commit110ba1f9415d5e901ff1b8fb9913118667865e01 (patch)
tree6ebae175e2fd8c2b7a62b606ddd0dc3d37a761ec
parenteb06033573e1391822ff74fd7425b7f918a7e6e9 (diff)
downloadmongo-1.2.1.tar.gz
Bump version to 1.2.1.1.2.1
-rw-r--r--NEWS14
-rw-r--r--README4
-rw-r--r--build_posix/aclocal/version-set.m44
-rw-r--r--build_posix/aclocal/version.m42
-rw-r--r--dist/RELEASE2
5 files changed, 20 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index dddee97e890..ee85efe14b7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+WiredTiger release 1.2.1, 2012-06-15
+------------------------------------
+
+This is a bugfix release. The changes are as follows:
+
+* Avoid a deadlock between eviction and checkpoint on the connection spinlock.
+
+* Allocate "desc" buffers in heap memory so that they are correctly aligned
+ (fixes direct_io support on Linux).
+
+* Initialize the snapshot-avail list after cleaning it out, else we'll try and
+ print a NULL pointer in VERBOSE mode.
+
+
WiredTiger release 1.2.0, 2012-06-04
------------------------------------
diff --git a/README b/README
index 16153cf0ef6..1d7c55fdcd7 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
-WiredTiger 1.2.0: (June 4, 2012)
+WiredTiger 1.2.1: (June 15, 2012)
-This is version 1.2.0 of WiredTiger.
+This is version 1.2.1 of WiredTiger.
WiredTiger documentation can be found at:
diff --git a/build_posix/aclocal/version-set.m4 b/build_posix/aclocal/version-set.m4
index 9750cf1547a..6fec543f420 100644
--- a/build_posix/aclocal/version-set.m4
+++ b/build_posix/aclocal/version-set.m4
@@ -2,8 +2,8 @@ dnl build by dist/s_version
VERSION_MAJOR=1
VERSION_MINOR=2
-VERSION_PATCH=0
-VERSION_STRING='"WiredTiger 1.2.0: (June 4, 2012)"'
+VERSION_PATCH=1
+VERSION_STRING='"WiredTiger 1.2.1: (June 15, 2012)"'
AC_SUBST(VERSION_MAJOR)
AC_SUBST(VERSION_MINOR)
diff --git a/build_posix/aclocal/version.m4 b/build_posix/aclocal/version.m4
index f81807a73e2..024be07fed4 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
-1.2.0
+1.2.1
diff --git a/dist/RELEASE b/dist/RELEASE
index 724eb3f7763..34a188021e3 100644
--- a/dist/RELEASE
+++ b/dist/RELEASE
@@ -1,6 +1,6 @@
WIREDTIGER_VERSION_MAJOR=1
WIREDTIGER_VERSION_MINOR=2
-WIREDTIGER_VERSION_PATCH=0
+WIREDTIGER_VERSION_PATCH=1
WIREDTIGER_VERSION="$WIREDTIGER_VERSION_MAJOR.$WIREDTIGER_VERSION_MINOR.$WIREDTIGER_VERSION_PATCH"
WIREDTIGER_RELEASE_DATE=`date "+%B %e, %Y"`