diff options
author | Keith Bostic <keith@wiredtiger.com> | 2014-03-23 22:06:04 -0400 |
---|---|---|
committer | Keith Bostic <keith@wiredtiger.com> | 2014-03-23 22:06:04 -0400 |
commit | eea2265dc19d52de84b7c19f33426442144d9983 (patch) | |
tree | ff13e36ed9be925bf60287180f6c97280342a085 /dist/flags.py | |
parent | a515ced46042f61443f677c277f1d0a62c31175f (diff) | |
parent | c39d0db64feed845dbaa876f1754a9df612618df (diff) | |
download | mongo-eea2265dc19d52de84b7c19f33426442144d9983.tar.gz |
Merge branch 'develop' into new-split
Conflicts:
src/btree/bt_evict.c
src/include/flags.h
Diffstat (limited to 'dist/flags.py')
-rw-r--r-- | dist/flags.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/flags.py b/dist/flags.py index ff0c4a63105..3dd81ec934b 100644 --- a/dist/flags.py +++ b/dist/flags.py @@ -56,7 +56,7 @@ flags = { ], 'verbose' : [ 'VERB_block', - 'VERB_ckpt', + 'VERB_checkpoint', 'VERB_compact', 'VERB_evict', 'VERB_evictserver', |