Merge branch 'master' of github.com:tarantool/tarantool into lua-stack-in-net-box
Conflicts: test/replication/consistent.test.lua test/replication/hot_standby.result test/replication/hot_standby.test.lua
No related branches found
No related tags found
Showing
- test/box/admin.result 5 additions, 2 deletionstest/box/admin.result
- test/box/admin.test.lua 3 additions, 0 deletionstest/box/admin.test.lua
- test/box/args.test.py 1 addition, 1 deletiontest/box/args.test.py
- test/box/bad_trigger.test.py 1 addition, 1 deletiontest/box/bad_trigger.test.py
- test/box/cfg.result 7 additions, 4 deletionstest/box/cfg.result
- test/box/cfg.test.lua 3 additions, 0 deletionstest/box/cfg.test.lua
- test/box/configuration.result 3 additions, 3 deletionstest/box/configuration.result
- test/box/configuration.test.py 22 additions, 18 deletionstest/box/configuration.test.py
- test/box/iproto.test.py 1 addition, 1 deletiontest/box/iproto.test.py
- test/box/lua/require_init.lua 1 addition, 1 deletiontest/box/lua/require_init.lua
- test/box/print.test.py 1 addition, 1 deletiontest/box/print.test.py
- test/box/reconfigure.result 4 additions, 4 deletionstest/box/reconfigure.result
- test/box/reconfigure.test.py 1 addition, 1 deletiontest/box/reconfigure.test.py
- test/box/snapshot.test.py 3 additions, 3 deletionstest/box/snapshot.test.py
- test/box/xlog.test.py 13 additions, 12 deletionstest/box/xlog.test.py
- test/lib/box_connection.py 5 additions, 6 deletionstest/lib/box_connection.py
- test/lib/colorer.py 0 additions, 1 deletiontest/lib/colorer.py
- test/lib/preprocessor.py 53 additions, 16 deletionstest/lib/preprocessor.py
- test/lib/server.py 21 additions, 12 deletionstest/lib/server.py
- test/lib/sql_ast.py 2 additions, 2 deletionstest/lib/sql_ast.py
Loading
Please register or sign in to comment