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

52b609fa

Commit 52b609fa authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/relay-no-cxx' into 1.6

Conflicts:
	src/box/relay.cc

parents 5a266c29 3ef3fdd0

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

src/box/engine.cc 2 additions, 2 deletions

src/box/engine.cc
src/box/engine.h 3 additions, 3 deletions

src/box/engine.h
src/box/memtx_engine.cc 1 addition, 1 deletion

src/box/memtx_engine.cc
src/box/memtx_engine.h 1 addition, 1 deletion

src/box/memtx_engine.h
src/box/relay.cc 26 additions, 15 deletions

src/box/relay.cc
src/box/relay.h 2 additions, 5 deletions

src/box/relay.h
src/box/sophia_engine.cc 2 additions, 2 deletions

src/box/sophia_engine.cc
src/box/sophia_engine.h 1 addition, 1 deletion

src/box/sophia_engine.h

with 38 additions and 30 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