diff options
| author | Susan LoVerso <sue@wiredtiger.com> | 2015-05-13 15:45:52 -0400 |
|---|---|---|
| committer | Susan LoVerso <sue@wiredtiger.com> | 2015-05-13 15:45:52 -0400 |
| commit | e4516210252cecb9ef219bb6bae472c5c7845bef (patch) | |
| tree | dd3913efd276ebf927a1e01cfbf574c4cb92391b /lang | |
| parent | 9ecfbc8ec0dac29fd70f1778db9a32143d2f7faf (diff) | |
| parent | d3a4e1b24f610c37b99a6385e4dd6fefd040ce7c (diff) | |
| download | mongo-e4516210252cecb9ef219bb6bae472c5c7845bef.tar.gz | |
Merge branch 'develop' into transaction-background
Conflicts:
src/include/config.h
src/include/txn.h
src/include/wiredtiger.in
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/java/java_doc.i | 1 | ||||
| -rw-r--r-- | lang/java/wiredtiger.i | 2 | ||||
| -rw-r--r-- | lang/python/wiredtiger.i | 2 |
3 files changed, 5 insertions, 0 deletions
diff --git a/lang/java/java_doc.i b/lang/java/java_doc.i index fa76fdb37e4..989457886a9 100644 --- a/lang/java/java_doc.i +++ b/lang/java/java_doc.i @@ -56,6 +56,7 @@ COPYDOC(__wt_connection, WT_CONNECTION, load_extension) COPYDOC(__wt_connection, WT_CONNECTION, add_data_source) COPYDOC(__wt_connection, WT_CONNECTION, add_collator) COPYDOC(__wt_connection, WT_CONNECTION, add_compressor) +COPYDOC(__wt_connection, WT_CONNECTION, add_encryptor) COPYDOC(__wt_connection, WT_CONNECTION, add_extractor) COPYDOC(__wt_config_parser, WT_CONFIG_PARSER, close) COPYDOC(__wt_config_parser, WT_CONFIG_PARSER, next) diff --git a/lang/java/wiredtiger.i b/lang/java/wiredtiger.i index a92247c7ebf..2d66a4e9e13 100644 --- a/lang/java/wiredtiger.i +++ b/lang/java/wiredtiger.i @@ -1743,6 +1743,8 @@ WT_ASYNC_CALLBACK javaApiAsyncHandler = {javaAsyncHandler}; %ignore __wt_connection::add_compressor; %ignore __wt_data_source; %ignore __wt_connection::add_data_source; +%ignore __wt_encryptor; +%ignore __wt_connection::add_encryptor; %ignore __wt_event_handler; %ignore __wt_extractor; %ignore __wt_connection::add_extractor; diff --git a/lang/python/wiredtiger.i b/lang/python/wiredtiger.i index f9218d7529c..3f297ca25a0 100644 --- a/lang/python/wiredtiger.i +++ b/lang/python/wiredtiger.i @@ -923,6 +923,7 @@ int verbose_build(); %ignore __wt_compressor; %ignore __wt_config_item; %ignore __wt_data_source; +%ignore __wt_encryptor; %ignore __wt_event_handler; %ignore __wt_extractor; %ignore __wt_item; @@ -931,6 +932,7 @@ int verbose_build(); %ignore __wt_connection::add_collator; %ignore __wt_connection::add_compressor; %ignore __wt_connection::add_data_source; +%ignore __wt_connection::add_encryptor; %ignore __wt_connection::add_extractor; %ignore __wt_connection::get_extension_api; %ignore __wt_session::log_printf; |