diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2015-03-26 06:05:23 +0000 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2015-03-26 06:05:23 +0000 |
| commit | 8bf8c80a2fc156e1a60fd4da4346d4bfa6f18123 (patch) | |
| tree | 0f56fde416cb0231283393e3b8a84255e4d6dbb9 /build_posix | |
| parent | 17db2e09c257d4e45f82e77eee894ed536262177 (diff) | |
| parent | 8227a3342a1dedbf783e982715f783b7dec07a7d (diff) | |
| download | mongo-8bf8c80a2fc156e1a60fd4da4346d4bfa6f18123.tar.gz | |
Merge branch 'master' into develop
Conflicts:
README
build_posix/aclocal/version-set.m4
src/docs/upgrading.dox
Diffstat (limited to 'build_posix')
| -rw-r--r-- | build_posix/aclocal/version-set.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_posix/aclocal/version-set.m4 b/build_posix/aclocal/version-set.m4 index d1102bb1e44..b19418fc29d 100644 --- a/build_posix/aclocal/version-set.m4 +++ b/build_posix/aclocal/version-set.m4 @@ -3,7 +3,7 @@ dnl build by dist/s_version VERSION_MAJOR=2 VERSION_MINOR=5 VERSION_PATCH=3 -VERSION_STRING='"WiredTiger 2.5.3: (March 24, 2015)"' +VERSION_STRING='"WiredTiger 2.5.3: (March 26, 2015)"' AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) |