diff options
| author | Susan LoVerso <sue@wiredtiger.com> | 2015-05-27 12:15:11 -0400 |
|---|---|---|
| committer | Susan LoVerso <sue@wiredtiger.com> | 2015-05-27 12:15:11 -0400 |
| commit | 474ff612e87986e5d921d11b01fa0c8c0fb78af0 (patch) | |
| tree | b8310a79d8fa904259e47cd715ddf4974a68d6fd /lang | |
| parent | 9520bcbe055e287b537c725f10cafc02f9a08eb2 (diff) | |
| parent | b119a556cbb3c4c48c35621d239152079cabcfa6 (diff) | |
| download | mongo-474ff612e87986e5d921d11b01fa0c8c0fb78af0.tar.gz | |
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
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 989457886a9..ea80b80df2d 100644 --- a/lang/java/java_doc.i +++ b/lang/java/java_doc.i @@ -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) |