diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-04-02 14:03:20 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-04-02 14:03:20 +1100 |
| commit | 2fc04b99b728089d6b9f0590ebc91cd74746dbe2 (patch) | |
| tree | e866ea3e510703f9cf28beca9237833e5b4732fc /build_posix | |
| parent | 709aee138afc865ab696bec0d99f63692f147769 (diff) | |
| parent | e9a607b1b78ffa528631519b5cb6ac944468991e (diff) | |
| download | mongo-2fc04b99b728089d6b9f0590ebc91cd74746dbe2.tar.gz | |
Merge branch 'basho' into lsm-ckpt-experiments
Conflicts:
src/btree/bt_evict.c
src/conn/conn_dhandle.c
src/cursor/cur_file.c
src/include/btree.h
src/lsm/lsm_cursor.c
src/meta/meta_track.c
src/schema/schema_plan.c
src/txn/txn_ckpt.c
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 c11f1444f56..7c9a7304d1e 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=1 -VERSION_STRING='"WiredTiger 1.5.1: (March 25, 2013)"' +VERSION_PATCH=2 +VERSION_STRING='"WiredTiger 1.5.2: (March 28, 2013)"' AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) diff --git a/build_posix/aclocal/version.m4 b/build_posix/aclocal/version.m4 index 52018ee0b7a..87932aa04ad 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.1 +1.5.2 |