diff options
| author | Alex Gorrod <alexg@wiredtiger.com> | 2014-10-15 11:47:13 +1100 |
|---|---|---|
| committer | Alex Gorrod <alexg@wiredtiger.com> | 2014-10-15 11:47:13 +1100 |
| commit | 2bca93d54b3b3c3ad01f1fe932a783e83495701e (patch) | |
| tree | bc1338268962976bbe00c1af9ffcd7a52e808cbe /lang | |
| parent | 01adce5055f2c994e35ace706e3cae4d30e60553 (diff) | |
| parent | ba4f6023c5c580b5f3be1d5538f57c03a8c49fe8 (diff) | |
| download | mongo-2bca93d54b3b3c3ad01f1fe932a783e83495701e.tar.gz | |
Merge branch 'develop' into json-load
Conflicts:
dist/s_string.ok
src/include/extern.h
src/utilities/util_load.c
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/python/setup.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/python/setup.py b/lang/python/setup.py index 1057006ce50..7d99c872bc3 100644 --- a/lang/python/setup.py +++ b/lang/python/setup.py @@ -39,8 +39,8 @@ extra_cflags = [ '-w' ] dir = os.path.dirname(__file__) -# Read the version information from the RELEASE file -for l in open(os.path.join(dir, '..', '..', 'RELEASE')): +# Read the version information from the RELEASE_INFO file +for l in open(os.path.join(dir, '..', '..', 'RELEASE_INFO')): if re.match(r'WIREDTIGER_VERSION_(?:MAJOR|MINOR|PATCH)=', l): exec(l) |