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

8bf936f7

Commit 8bf936f7 authored 6 years ago by Vladimir Davydov

Downloads
- Plain Diff

Merge branch '1.9' into 1.10

parents ad6a2498 113ade24

No related branches found

No related tags found

No related merge requests found

Changes 14

Hide whitespace changes

Inline Side-by-side

Showing

src/box/box.cc 42 additions, 19 deletions

src/box/box.cc
src/box/box.h 10 additions, 4 deletions

src/box/box.h
src/box/lua/cfg.cc 25 additions, 1 deletion

src/box/lua/cfg.cc
src/box/lua/load_cfg.lua 7 additions, 1 deletion

src/box/lua/load_cfg.lua
src/box/replication.cc 28 additions, 31 deletions

src/box/replication.cc
src/box/replication.h 6 additions, 0 deletions

src/box/replication.h
test/app-tap/init_script.result 22 additions, 21 deletions

test/app-tap/init_script.result
test/box-tap/cfg.test.lua 3 additions, 1 deletion

test/box-tap/cfg.test.lua
test/box/admin.result 2 additions, 0 deletions

test/box/admin.result
test/box/cfg.result 33 additions, 0 deletions

test/box/cfg.result
test/box/cfg.test.lua 14 additions, 0 deletions

test/box/cfg.test.lua
test/replication/suite.ini 1 addition, 1 deletion

test/replication/suite.ini
test/replication/sync.result 237 additions, 0 deletions

test/replication/sync.result
test/replication/sync.test.lua 117 additions, 0 deletions

test/replication/sync.test.lua

with 547 additions and 79 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