Merge branch 'master' into transferring-snapshot-to-replica
Conflicts: CMakeLists.txt
No related branches found
No related tags found
Showing
- .gitmodules 3 additions, 0 deletions.gitmodules
- CMakeLists.txt 1 addition, 0 deletionsCMakeLists.txt
- cfg/warning.c 7 additions, 5 deletionscfg/warning.c
- cfg/warning.h 4 additions, 1 deletioncfg/warning.h
- client/tarantool/tc.c 43 additions, 6 deletionsclient/tarantool/tc.c
- client/tarantool/tc_buf.c 26 additions, 3 deletionsclient/tarantool/tc_buf.c
- client/tarantool/tc_buf.h 4 additions, 1 deletionclient/tarantool/tc_buf.h
- client/tarantool/tc_cli.c 42 additions, 32 deletionsclient/tarantool/tc_cli.c
- client/tarantool/tc_opt.c 1 addition, 2 deletionsclient/tarantool/tc_opt.c
- client/tarantool/tc_print_snap.c 1 addition, 3 deletionsclient/tarantool/tc_print_snap.c
- client/tarantool/tc_print_xlog.c 5 additions, 2 deletionsclient/tarantool/tc_print_xlog.c
- cmake/BuildMisc.cmake 5 additions, 0 deletionscmake/BuildMisc.cmake
- doc/user/configuration-reference.xml 10 additions, 15 deletionsdoc/user/configuration-reference.xml
- doc/user/language-reference.xml 44 additions, 54 deletionsdoc/user/language-reference.xml
- doc/user/persistence-architecture.xml 1 addition, 1 deletiondoc/user/persistence-architecture.xml
- doc/user/preface.xml 5 additions, 5 deletionsdoc/user/preface.xml
- doc/user/replication.xml 2 additions, 2 deletionsdoc/user/replication.xml
- doc/user/stored-procedures.xml 120 additions, 120 deletionsdoc/user/stored-procedures.xml
- doc/user/target.db 4 additions, 2 deletionsdoc/user/target.db
- extra/rpm.spec.in 4 additions, 3 deletionsextra/rpm.spec.in
Loading
Please register or sign in to comment