Merge branch 'init-in-lua-v2'
Conflicts: src/ffisyms.cc
No related branches found
No related tags found
Showing
- src/CMakeLists.txt 4 additions, 17 deletionssrc/CMakeLists.txt
- src/admin.cc 5 additions, 1 deletionsrc/admin.cc
- src/admin.h 2 additions, 1 deletionsrc/admin.h
- src/box/box.cc 172 additions, 121 deletionssrc/box/box.cc
- src/box/box.h 12 additions, 14 deletionssrc/box/box.h
- src/box/lua/box.lua 0 additions, 4 deletionssrc/box/lua/box.lua
- src/cfg.cc 78 additions, 0 deletionssrc/cfg.cc
- src/cfg.h 39 additions, 0 deletionssrc/cfg.h
- src/errcode.c 28 additions, 0 deletionssrc/errcode.c
- src/errcode.h 2 additions, 0 deletionssrc/errcode.h
- src/ffisyms.cc 11 additions, 1 deletionsrc/ffisyms.cc
- src/log_io.cc 4 additions, 0 deletionssrc/log_io.cc
- src/lua/info.cc 9 additions, 10 deletionssrc/lua/info.cc
- src/lua/init.cc 9 additions, 126 deletionssrc/lua/init.cc
- src/lua/init.h 1 addition, 7 deletionssrc/lua/init.h
- src/lua/interactive.lua 8 additions, 5 deletionssrc/lua/interactive.lua
- src/lua/load_cfg.lua 96 additions, 0 deletionssrc/lua/load_cfg.lua
- src/recovery.cc 16 additions, 6 deletionssrc/recovery.cc
- src/recovery.h 2 additions, 2 deletionssrc/recovery.h
- src/say.c 9 additions, 3 deletionssrc/say.c
Loading
Please register or sign in to comment