Merge branch '1.10' into 1.10-features
Showing
- src/box/box.cc 11 additions, 1 deletionsrc/box/box.cc
- src/box/box.h 12 additions, 0 deletionssrc/box/box.h
- src/box/lua/info.c 3 additions, 3 deletionssrc/box/lua/info.c
- src/box/request.c 27 additions, 12 deletionssrc/box/request.c
- src/httpc.c 6 additions, 4 deletionssrc/httpc.c
- test/app/socket.result 28 additions, 26 deletionstest/app/socket.result
- test/app/socket.skipcond 4 additions, 4 deletionstest/app/socket.skipcond
- test/app/socket.test.lua 24 additions, 19 deletionstest/app/socket.test.lua
- test/engine/ddl.result 5 additions, 9 deletionstest/engine/ddl.result
- test/engine/ddl.test.lua 5 additions, 4 deletionstest/engine/ddl.test.lua
- test/replication/before_replace.result 83 additions, 0 deletionstest/replication/before_replace.result
- test/replication/before_replace.test.lua 41 additions, 1 deletiontest/replication/before_replace.test.lua
- test/replication/hot_standby.result 26 additions, 0 deletionstest/replication/hot_standby.result
- test/replication/hot_standby.test.lua 10 additions, 0 deletionstest/replication/hot_standby.test.lua
Loading
Please register or sign in to comment