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

Merge branch 'develop' into named-snapshots

Browse Source 
Conflicts:
	dist/api_data.py
	src/config/config_def.c
	src/include/config.h
	src/txn/txn.c
This commit is contained in:
Michael Cahill
2015-05-13 16:46:16 +10:00
parent 7609a565a1 d6d869f4ae
commit 6237ef264d
253 changed files with 9755 additions and 4970 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)