diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-04-24 11:44:33 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-04-24 11:44:33 +1000 |
| commit | 59712dd207d909f8f85fd70fd09ab6bb3ed525c2 (patch) | |
| tree | ce32a651623879ed2ca35457e287d5e7dd1e7dd4 /dist/s_funcs.list | |
| parent | 365c48ed38ac3ed9868214059b67a59875c693ad (diff) | |
| parent | 70f1aba0b4ffbc46dbbec1e31b3ecddf1acfe2d2 (diff) | |
| download | mongo-59712dd207d909f8f85fd70fd09ab6bb3ed525c2.tar.gz | |
Merge branch 'develop' into lsm-ckpt-experiments
Conflicts:
src/bloom/bloom.c
src/config/config_def.c
src/lsm/lsm_cursor.c
src/lsm/lsm_merge.c
src/lsm/lsm_tree.c
src/lsm/lsm_worker.c
Diffstat (limited to 'dist/s_funcs.list')
| -rw-r--r-- | dist/s_funcs.list | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dist/s_funcs.list b/dist/s_funcs.list index 9813a17a27a..fde9fa9757a 100644 --- a/dist/s_funcs.list +++ b/dist/s_funcs.list @@ -20,11 +20,11 @@ wiredtiger_pack_int wiredtiger_pack_item wiredtiger_pack_str wiredtiger_pack_uint +wiredtiger_struct_pack +wiredtiger_struct_size +wiredtiger_struct_unpack wiredtiger_unpack_int wiredtiger_unpack_item wiredtiger_unpack_start wiredtiger_unpack_str wiredtiger_unpack_uint -wiredtiger_struct_pack -wiredtiger_struct_size -wiredtiger_struct_unpack |