Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tarantool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

06b2e859

Commit 06b2e859 authored 8 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/move-bootstrap-to-engine' into 1.7

Conflicts:
	src/box/box.cc

parents 52a99011 887accdb

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/box/box.cc 1 addition, 4 deletions

src/box/box.cc
src/box/engine.cc 9 additions, 0 deletions

src/box/engine.cc
src/box/engine.h 10 additions, 0 deletions

src/box/engine.h
src/box/memtx_engine.cc 24 additions, 0 deletions

src/box/memtx_engine.cc
src/box/memtx_engine.h 1 addition, 0 deletions

src/box/memtx_engine.h
src/box/recovery.cc 0 additions, 20 deletions

src/box/recovery.cc
src/box/recovery.h 0 additions, 3 deletions

src/box/recovery.h

with 45 additions and 27 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment