diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-06-25 11:48:37 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2014-06-25 11:48:37 +1000 |
| commit | 6efed5fcc999d394ae3596580c8be47cc3de32bd (patch) | |
| tree | ed29b9ef9959f6013153bf4de90eb522ddc4efcf /build_posix | |
| parent | f50ed480b1904ed3be417d08fe4efd54278545d4 (diff) | |
| parent | 80a6c14c4cb5002dde11c79cdbf61222ccdb8d80 (diff) | |
| download | mongo-6efed5fcc999d394ae3596580c8be47cc3de32bd.tar.gz | |
Merge branch 'develop' into leveldb-api
Conflicts:
src/config/config_def.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 2f5ca0608cb..912af060088 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=2 VERSION_MINOR=2 -VERSION_PATCH=1 -VERSION_STRING='"WiredTiger 2.2.1: (May 21, 2014)"' +VERSION_PATCH=2 +VERSION_STRING='"WiredTiger 2.2.2: (June 25, 2014)"' AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) diff --git a/build_posix/aclocal/version.m4 b/build_posix/aclocal/version.m4 index e1fcc8e9cad..7496b868b78 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.2.1 +2.2.2 |