diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2015-01-17 07:48:42 +1100 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2015-01-17 07:48:42 +1100 |
| commit | 1dae9366fda9c7a9ca3d85e7f1ee0e43fa569331 (patch) | |
| tree | e6d0cac3945999953466b8156ba7b3f616430b38 /lang | |
| parent | a30db47d03f48220553922422950273a14118160 (diff) | |
| parent | 2bd04ab9f9d841a525a21612b90a835a9c517985 (diff) | |
| download | mongo-1dae9366fda9c7a9ca3d85e7f1ee0e43fa569331.tar.gz | |
Merge branch 'develop' into cursor-equal
Conflicts:
src/cursor/cur_std.c
src/cursor/cur_table.c
src/include/extern.h
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/java/java_doc.i | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lang/java/java_doc.i b/lang/java/java_doc.i index 0890b14fa65..53785a3bab4 100644 --- a/lang/java/java_doc.i +++ b/lang/java/java_doc.i @@ -15,6 +15,7 @@ COPYDOC(__wt_cursor, WT_CURSOR, insert) COPYDOC(__wt_cursor, WT_CURSOR, update) COPYDOC(__wt_cursor, WT_CURSOR, remove) COPYDOC(__wt_cursor, WT_CURSOR, close) +COPYDOC(__wt_cursor, WT_CURSOR, reconfigure) COPYDOC(__wt_async_op, WT_ASYNC_OP, get_key) COPYDOC(__wt_async_op, WT_ASYNC_OP, get_value) COPYDOC(__wt_async_op, WT_ASYNC_OP, set_key) |