xuemingqiang/mongo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into transaction-background

Browse Source 
Conflicts:
	src/include/config.h
	src/include/txn.h
	src/include/wiredtiger.in
This commit is contained in:
Susan LoVerso
2015-05-13 15:45:52 -04:00
parent 9ecfbc8ec0 d3a4e1b24f
commit e451621025
147 changed files with 5398 additions and 1897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lang/java/java_doc.i
View File

@@ -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)