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

7bed5432

Commit 7bed5432 authored 10 years ago by Dmitry E. Oboukhov

Downloads
- Plain Diff

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

parents 49094a39 06174b26

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/box.cc 13 additions, 2 deletions

src/box/box.cc
src/box/box.h 6 additions, 1 deletion

src/box/box.h
src/box/cluster.cc 2 additions, 0 deletions

src/box/cluster.cc
src/box/lua/info.cc 5 additions, 7 deletions

src/box/lua/info.cc
src/errcode.h 1 addition, 1 deletion

src/errcode.h
test/box/misc.result 15 additions, 15 deletions

test/box/misc.result
test/lib/sql_ast.py 1 addition, 1 deletion

test/lib/sql_ast.py
test/replication/hot_standby.result 1 addition, 1 deletion

test/replication/hot_standby.result
test/replication/hot_standby.test.lua 1 addition, 1 deletion

test/replication/hot_standby.test.lua
test/replication/readonly.result 41 additions, 0 deletions

test/replication/readonly.result
test/replication/readonly.test.py 46 additions, 0 deletions

test/replication/readonly.test.py
test/replication/swap.result 1 addition, 1 deletion

test/replication/swap.result
test/replication/swap.test.py 1 addition, 1 deletion

test/replication/swap.test.py

with 134 additions and 31 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