diff options
| author | Susan LoVerso <sue@wiredtiger.com> | 2014-08-12 15:18:44 -0400 |
|---|---|---|
| committer | Susan LoVerso <sue@wiredtiger.com> | 2014-08-12 15:18:44 -0400 |
| commit | df0d6f8d46dbf356f18e81451f15672d6f21a867 (patch) | |
| tree | 086fca1426914748305e9bd9e2c38eff56f78897 /api | |
| parent | 906b24a01756bf57c4ed30ef1a4e312d45546f3f (diff) | |
| download | mongo-df0d6f8d46dbf356f18e81451f15672d6f21a867.tar.gz | |
Fix merge/conflict error.
Diffstat (limited to 'api')
| -rw-r--r-- | api/leveldb/leveldb_wt.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/api/leveldb/leveldb_wt.h b/api/leveldb/leveldb_wt.h index 94ad2e01951..301fa250e85 100644 --- a/api/leveldb/leveldb_wt.h +++ b/api/leveldb/leveldb_wt.h @@ -45,9 +45,10 @@ #include "wiredtiger.h" #define WT_URI "table:data" -#define WT_CONN_CONFIG "log=(enabled),checkpoint=(wait=180)," \ - "checkpoint_sync=false,session_max=8192,eviction_workers=4," \ - "mmap=false,transaction_sync=(enabled=true,method=none)," +#define WT_CONN_CONFIG \ + "log=(enabled),checkpoint=(wait=180),checkpoint_sync=false," \ + "session_max=8192,mmap=false," \ + "transaction_sync=(enabled=true,method=none)," // Note: LSM doesn't split, build full pages from the start #define WT_TABLE_CONFIG "type=lsm,split_pct=100,leaf_item_max=1KB," \ "lsm=(chunk_size=100MB,bloom_config=(leaf_page_max=8MB))," |