Merge branch 'master' of github.com:mailru/tarantool into debian-cur
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- CMakeLists.txt 4 additions, 2 deletionsCMakeLists.txt
- cfg/core_cfg.cfg_tmpl 2 additions, 2 deletionscfg/core_cfg.cfg_tmpl
- cfg/tarantool_box_cfg.c 10 additions, 10 deletionscfg/tarantool_box_cfg.c
- cfg/tarantool_box_cfg.h 2 additions, 3 deletionscfg/tarantool_box_cfg.h
- client/tarantool/CMakeLists.txt 12 additions, 9 deletionsclient/tarantool/CMakeLists.txt
- doc/CMakeLists.txt 7 additions, 2 deletionsdoc/CMakeLists.txt
- doc/developer/CMakeLists.txt 15 additions, 15 deletionsdoc/developer/CMakeLists.txt
- doc/user/CMakeLists.txt 23 additions, 15 deletionsdoc/user/CMakeLists.txt
- doc/user/configuration-reference.xml 3 additions, 3 deletionsdoc/user/configuration-reference.xml
- doc/user/stored-programs.xml 19 additions, 2 deletionsdoc/user/stored-programs.xml
- extra/CMakeLists.txt 3 additions, 1 deletionextra/CMakeLists.txt
- extra/tarantool_box 3 additions, 3 deletionsextra/tarantool_box
- extra/tarantool_expand.sh 13 additions, 13 deletionsextra/tarantool_expand.sh
- extra/txt2c.c 81 additions, 0 deletionsextra/txt2c.c
- include/errcode.h 4 additions, 4 deletionsinclude/errcode.h
- include/log_io.h 14 additions, 7 deletionsinclude/log_io.h
- include/salloc.h 1 addition, 1 deletioninclude/salloc.h
- include/tarantool.h 7 additions, 0 deletionsinclude/tarantool.h
- include/tarantool_pthread.h 17 additions, 10 deletionsinclude/tarantool_pthread.h
Loading
Please register or sign in to comment