diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-11-21 15:41:14 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-11-21 15:41:14 +1100 |
| commit | 38d179ea0012629b21c0adc32568faf7b7f252bf (patch) | |
| tree | ef03208b85135490b2c2e5577c8626579f60baff /dist | |
| parent | 5b014e6d2ff39e187e5a95daf01ea77a8f3a8aca (diff) | |
| parent | d8e3be79ccc9592efbd6d9fa30c47fe7977fa54a (diff) | |
| download | mongo-38d179ea0012629b21c0adc32568faf7b7f252bf.tar.gz | |
Merge branch 'develop' into fine-grained-durability
Conflicts:
dist/s_define.list
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/s_define.list | 2 | ||||
| -rw-r--r-- | dist/s_string.ok | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/dist/s_define.list b/dist/s_define.list index 6618c269e37..d6f03129808 100644 --- a/dist/s_define.list +++ b/dist/s_define.list @@ -20,6 +20,8 @@ WT_BARRIER WT_BLOCK_DESC_SIZE WT_CACHE_LINE_ALIGNMENT WT_DEBUG_BYTE +WT_HANDLE_CLOSED +WT_HANDLE_NULLABLE WT_LOGREC_DEBUG WT_READ_BARRIER WT_REF_SIZE diff --git a/dist/s_string.ok b/dist/s_string.ok index b7a420d9a38..a66518d57d5 100644 --- a/dist/s_string.ok +++ b/dist/s_string.ok @@ -555,6 +555,7 @@ keyv kv kvs kvsbdb +lang latencies ld len |