Merge branch 'stable'
Conflicts: debian/tarantool-sql-module.install extra/rpm.spec.in src/lua/init.cc test/CMakeLists.txt
No related branches found
No related tags found
Showing
- CMakeLists.txt 16 additions, 33 deletionsCMakeLists.txt
- cmake/luajit.cmake 4 additions, 0 deletionscmake/luajit.cmake
- connector/c/tnt/CMakeLists.txt 2 additions, 2 deletionsconnector/c/tnt/CMakeLists.txt
- connector/c/tntnet/CMakeLists.txt 2 additions, 2 deletionsconnector/c/tntnet/CMakeLists.txt
- connector/c/tntrpl/CMakeLists.txt 2 additions, 2 deletionsconnector/c/tntrpl/CMakeLists.txt
- connector/c/tntsql/CMakeLists.txt 2 additions, 2 deletionsconnector/c/tntsql/CMakeLists.txt
- debian/control 10 additions, 0 deletionsdebian/control
- debian/libtarantool-dev.install 1 addition, 1 deletiondebian/libtarantool-dev.install
- debian/rules 13 additions, 7 deletionsdebian/rules
- debian/tarantool-dev.install 7 additions, 0 deletionsdebian/tarantool-dev.install
- debian/tarantool-sql-module.install 1 addition, 1 deletiondebian/tarantool-sql-module.install
- doc/man/CMakeLists.txt 2 additions, 2 deletionsdoc/man/CMakeLists.txt
- extra/CMakeLists.txt 1 addition, 1 deletionextra/CMakeLists.txt
- extra/rpm.spec.in 39 additions, 14 deletionsextra/rpm.spec.in
- src/lua/init.cc 3 additions, 4 deletionssrc/lua/init.cc
- src/module/mysql/CMakeLists.txt 1 addition, 1 deletionsrc/module/mysql/CMakeLists.txt
- src/module/pg/CMakeLists.txt 1 addition, 1 deletionsrc/module/pg/CMakeLists.txt
- src/module/sophia/CMakeLists.txt 1 addition, 1 deletionsrc/module/sophia/CMakeLists.txt
- src/module/sql/CMakeLists.txt 1 addition, 1 deletionsrc/module/sql/CMakeLists.txt
- src/trivia/config.h.cmake 9 additions, 6 deletionssrc/trivia/config.h.cmake
Loading
Please register or sign in to comment