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

285c1190

Commit 285c1190 authored 9 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/gh-729-multi-master-v2' into 1.6

parents 5d52dce5 cc0aac13

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/box/applier.h 1 addition, 0 deletions

src/box/applier.h
src/box/box.cc 88 additions, 30 deletions

src/box/box.cc
src/box/lua/load_cfg.lua 1 addition, 1 deletion

src/box/lua/load_cfg.lua
src/cfg.cc 18 additions, 3 deletions

src/cfg.cc
test/replication/multi.result 81 additions, 0 deletions

test/replication/multi.result
test/replication/multi.test.py 111 additions, 0 deletions

test/replication/multi.test.py

with 300 additions and 34 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