Merge branch 'develop' into transaction-background

Conflicts:
	src/config/config_def.c
	src/include/config.h
	src/include/txn.h
	src/log/log.c
	src/session/session_api.c
This commit is contained in:
Susan LoVerso
2015-05-27 12:15:11 -04:00
81 changed files with 2694 additions and 537 deletions

View File

@@ -43,6 +43,7 @@ COPYDOC(__wt_session, WT_SESSION, begin_transaction)
COPYDOC(__wt_session, WT_SESSION, commit_transaction)
COPYDOC(__wt_session, WT_SESSION, rollback_transaction)
COPYDOC(__wt_session, WT_SESSION, checkpoint)
COPYDOC(__wt_session, WT_SESSION, snapshot)
COPYDOC(__wt_session, WT_SESSION, transaction_pinned_range)
COPYDOC(__wt_session, WT_SESSION, transaction_sync)
COPYDOC(__wt_connection, WT_CONNECTION, async_flush)