Merge remote-tracking branch 'origin/master' into 1.6
No related branches found
No related tags found
Showing
- doc/sphinx/book/box/box_index.rst 1 addition, 1 deletiondoc/sphinx/book/box/box_index.rst
- doc/sphinx/book/box/box_space.rst 0 additions, 4 deletionsdoc/sphinx/book/box/box_space.rst
- doc/sphinx/book/box/index.rst 15 additions, 24 deletionsdoc/sphinx/book/box/index.rst
- doc/sphinx/book/box/limitations.rst 3 additions, 4 deletionsdoc/sphinx/book/box/limitations.rst
- doc/sphinx/book/configuration/cfg-basic.rst 1 addition, 1 deletiondoc/sphinx/book/configuration/cfg-basic.rst
- doc/sphinx/dev_guide/building_from_source.rst 5 additions, 2 deletionsdoc/sphinx/dev_guide/building_from_source.rst
- src/box/box.cc 2 additions, 0 deletionssrc/box/box.cc
- src/box/error.cc 9 additions, 0 deletionssrc/box/error.cc
- src/box/error.h 9 additions, 0 deletionssrc/box/error.h
- src/box/index.cc 5 additions, 0 deletionssrc/box/index.cc
- src/box/iproto.cc 27 additions, 2 deletionssrc/box/iproto.cc
- src/box/lua/stat.cc 37 additions, 3 deletionssrc/box/lua/stat.cc
- src/cbus.cc 21 additions, 2 deletionssrc/cbus.cc
- src/cbus.h 19 additions, 0 deletionssrc/cbus.h
- src/rmean.h 1 addition, 0 deletionssrc/rmean.h
- test/box/misc.result 1 addition, 0 deletionstest/box/misc.result
- test/box/stat.result 17 additions, 0 deletionstest/box/stat.result
- test/box/stat.test.lua 6 additions, 0 deletionstest/box/stat.test.lua
- test/box/stat_net.result 57 additions, 0 deletionstest/box/stat_net.result
- test/box/stat_net.test.lua 24 additions, 0 deletionstest/box/stat_net.test.lua
Loading
Please register or sign in to comment