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

2c365b0b

Commit 2c365b0b authored 6 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/1.9' into 1.10

parents ec4e8c4f 8f63d5d9

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

src/box/applier.cc 12 additions, 5 deletions

src/box/applier.cc
src/box/relay.cc 14 additions, 2 deletions

src/box/relay.cc
src/box/vinyl.c 10 additions, 0 deletions

src/box/vinyl.c
src/box/wal.cc 13 additions, 2 deletions

src/box/wal.cc
test/replication/catch.result 10 additions, 11 deletions

test/replication/catch.result
test/replication/catch.test.lua 6 additions, 7 deletions

test/replication/catch.test.lua
test/replication/recover_missing_xlog.result 113 additions, 0 deletions

test/replication/recover_missing_xlog.result
test/replication/recover_missing_xlog.test.lua 40 additions, 0 deletions

test/replication/recover_missing_xlog.test.lua
test/replication/suite.ini 1 addition, 1 deletion

test/replication/suite.ini
test/vinyl/quota_timeout.result 37 additions, 18 deletions

test/vinyl/quota_timeout.result
test/vinyl/quota_timeout.test.lua 21 additions, 13 deletions

test/vinyl/quota_timeout.test.lua
third_party/luarocks 1 addition, 1 deletion

third_party/luarocks
third_party/tarantool_ev.h 4 additions, 0 deletions

third_party/tarantool_ev.h

with 282 additions and 60 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