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

10d3c31e

Commit 10d3c31e authored 10 years ago by Konstantin Osipov

Downloads
- Plain Diff

Merge branch 'master' of github.com:tarantool/tarantool

parents fdc3d1dd d56371aa

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

src/box/box.cc
src/box/replica.cc 3 additions, 1 deletion

src/box/replica.cc
test/box/info.result 1 addition, 1 deletion

test/box/info.result
test/lib/tarantool_server.py 1 addition, 1 deletion

test/lib/tarantool_server.py
test/replication/suite.ini 1 addition, 1 deletion

test/replication/suite.ini
test/replication/swap.test.py 6 additions, 6 deletions

test/replication/swap.test.py

with 14 additions and 12 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