Merge remote-tracking branch 'origin/stable'
Conflicts: .gitignore test/lib/test_suite.py test/unit/CMakeLists.txt third_party/luajit
No related branches found
No related tags found
Showing
- .gitignore 1 addition, 12 deletions.gitignore
- test/connector_c/xlog_rpl.test 1 addition, 1 deletiontest/connector_c/xlog_rpl.test
- test/lib/server.py 5 additions, 7 deletionstest/lib/server.py
- test/lib/tarantool_box_server.py 0 additions, 62 deletionstest/lib/tarantool_box_server.py
- test/lib/tarantool_server.py 108 additions, 17 deletionstest/lib/tarantool_server.py
- test/lib/test_suite.py 33 additions, 76 deletionstest/lib/test_suite.py
- test/lib/unittest_server.py 77 additions, 13 deletionstest/lib/unittest_server.py
- test/replication/consistent.test 2 additions, 2 deletionstest/replication/consistent.test
- test/replication/hot_standby.test 3 additions, 3 deletionstest/replication/hot_standby.test
- test/replication/memcached.test 2 additions, 2 deletionstest/replication/memcached.test
- test/replication/swap.test 2 additions, 2 deletionstest/replication/swap.test
- test/share/tarantool.sup 0 additions, 0 deletionstest/share/tarantool.sup
- test/test-run.py 10 additions, 16 deletionstest/test-run.py
- test/unit/CMakeLists.txt 16 additions, 16 deletionstest/unit/CMakeLists.txt
- test/unit/base64.test 0 additions, 1 deletiontest/unit/base64.test
- test/unit/bit.test 0 additions, 1 deletiontest/unit/bit.test
- test/unit/bitset_basic.test 0 additions, 1 deletiontest/unit/bitset_basic.test
- test/unit/bitset_index.test 0 additions, 1 deletiontest/unit/bitset_index.test
- test/unit/bitset_iterator.test 0 additions, 1 deletiontest/unit/bitset_iterator.test
- test/unit/mhash.test 0 additions, 1 deletiontest/unit/mhash.test
Loading
Please register or sign in to comment