diff options
| author | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-05-02 16:30:55 +1000 |
|---|---|---|
| committer | Michael Cahill <michael.cahill@wiredtiger.com> | 2012-05-02 16:30:55 +1000 |
| commit | 49d1030805bd2a2e33f95376b7c4fb659a84e34a (patch) | |
| tree | b2cf09ca7d7f620862feaf386f857df10245a0cb /dist/filelist | |
| parent | fd2ec0bf33c0275788db548f576aeb77901de054 (diff) | |
| parent | 2feb23c453ce625448f0edc425aa9faa3c3eff18 (diff) | |
| download | mongo-49d1030805bd2a2e33f95376b7c4fb659a84e34a.tar.gz | |
Merge branch 'develop' into feature/transactions
Conflicts:
src/session/session_api.c
Diffstat (limited to 'dist/filelist')
| -rw-r--r-- | dist/filelist | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/dist/filelist b/dist/filelist index 69b7015715d..1000575fba0 100644 --- a/dist/filelist +++ b/dist/filelist @@ -11,6 +11,7 @@ src/block/block_mgr.c src/block/block_open.c src/block/block_read.c src/block/block_slvg.c +src/block/block_snap.c src/block/block_vrfy.c src/block/block_write.c src/btree/bt_bulk.c @@ -64,6 +65,10 @@ src/cursor/cur_std.c src/cursor/cur_table.c src/log/log.c src/log/log_desc.c +src/meta/meta_api.c +src/meta/meta_snapshot.c +src/meta/meta_table.c +src/meta/meta_track.c src/os_posix/os_abort.c src/os_posix/os_alloc.c src/os_posix/os_dlopen.c @@ -92,14 +97,11 @@ src/schema/schema_open.c src/schema/schema_plan.c src/schema/schema_project.c src/schema/schema_rename.c -src/schema/schema_table.c -src/schema/schema_track.c src/schema/schema_truncate.c src/schema/schema_util.c src/schema/schema_worker.c src/session/session_api.c src/session/session_btree.c -src/session/session_root.c src/support/err.c src/support/filename.c src/support/global.c |