diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-03-26 21:33:04 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-03-26 21:33:04 +1100 |
| commit | 709aee138afc865ab696bec0d99f63692f147769 (patch) | |
| tree | d43d6a3fe81814d86851e884b75cd90a4fb9b508 /build_posix | |
| parent | 2c59ca07047d2f52931d5c1ea5ae80b04aac6caa (diff) | |
| parent | e515ca6b1966207b5091999b9ad499ae18f5d075 (diff) | |
| download | mongo-709aee138afc865ab696bec0d99f63692f147769.tar.gz | |
Merge branch 'basho' into lsm-ckpt-experiments
Conflicts:
src/include/wiredtiger.in
Diffstat (limited to 'build_posix')
| -rw-r--r-- | build_posix/aclocal/version-set.m4 | 4 | ||||
| -rw-r--r-- | build_posix/aclocal/version.m4 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/build_posix/aclocal/version-set.m4 b/build_posix/aclocal/version-set.m4 index 762c30c464d..c11f1444f56 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=5 -VERSION_PATCH=0 -VERSION_STRING='"WiredTiger 1.5.0: (March 14, 2013)"' +VERSION_PATCH=1 +VERSION_STRING='"WiredTiger 1.5.1: (March 25, 2013)"' AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) diff --git a/build_posix/aclocal/version.m4 b/build_posix/aclocal/version.m4 index 55081c7412c..52018ee0b7a 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.5.0 +1.5.1 |