Merge branch 'master' of github.com:mailru/tarantool into package-rpm
Conflicts: test/CMakeLists.txt
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- CMakeLists.txt 12 additions, 2 deletionsCMakeLists.txt
- cfg/tarantool_box_cfg.c 2 additions, 2 deletionscfg/tarantool_box_cfg.c
- client/tarantool/CMakeLists.txt 2 additions, 1 deletionclient/tarantool/CMakeLists.txt
- client/tarantool/tnt.c 9 additions, 11 deletionsclient/tarantool/tnt.c
- connector/c/tnt/CMakeLists.txt 1 addition, 1 deletionconnector/c/tnt/CMakeLists.txt
- connector/c/tnt/include/tnt.h 8 additions, 0 deletionsconnector/c/tnt/include/tnt.h
- connector/c/tnt/tnt_call.c 10 additions, 2 deletionsconnector/c/tnt/tnt_call.c
- connector/c/tnt/tnt_iter.c 1 addition, 1 deletionconnector/c/tnt/tnt_iter.c
- connector/c/tnt/tnt_reply.c 8 additions, 5 deletionsconnector/c/tnt/tnt_reply.c
- connector/c/tntnet/CMakeLists.txt 1 addition, 1 deletionconnector/c/tntnet/CMakeLists.txt
- connector/c/tntnet/tnt_io.c 4 additions, 4 deletionsconnector/c/tntnet/tnt_io.c
- connector/c/tntsql/CMakeLists.txt 1 addition, 1 deletionconnector/c/tntsql/CMakeLists.txt
- connector/c/tntsql/include/tnt_lex.h 2 additions, 0 deletionsconnector/c/tntsql/include/tnt_lex.h
- connector/c/tntsql/tnt_lex.c 17 additions, 15 deletionsconnector/c/tntsql/tnt_lex.c
- connector/c/tntsql/tnt_sql.c 64 additions, 41 deletionsconnector/c/tntsql/tnt_sql.c
- connector/perl/MANIFEST 11 additions, 1 deletionconnector/perl/MANIFEST
- connector/perl/Makefile.PL 7 additions, 4 deletionsconnector/perl/Makefile.PL
- connector/perl/lib/MR/IProto.pm 540 additions, 606 deletionsconnector/perl/lib/MR/IProto.pm
- connector/perl/lib/MR/IProto/Cluster.pm 253 additions, 0 deletionsconnector/perl/lib/MR/IProto/Cluster.pm
Loading
Please register or sign in to comment