Merge branch 'tt-merge-servers'

184208da · Konstantin Osipov · 47155fdc · 8a7ce945 · 184208da · 184208da
Commit 184208da authored 11 years ago by Konstantin Osipov
--- a/test/big/bitset.test
+++ b/test/big/bitset.test
--- a/test/big/hash.test
+++ b/test/big/hash.test
--- a/test/big/hash_multipart.test
+++ b/test/big/hash_multipart.test
--- a/test/big/iterator.test
+++ b/test/big/iterator.test
--- a/test/big/lua.test
+++ b/test/big/lua.test
--- a/test/python/sql.result
+++ b/test/python/sql.result
--- a/test/python/sql.test
+++ b/test/python/sql.test
--- a/test/big/suite.ini
+++ b/test/big/suite.ini
 [default]
-core = lua tarantool
+core = tarantool
 config = tarantool.cfg
-description = lua analogue of big tests
+description = lua big tests
 lua_libs = lua/utils.lua lua/bitset.lua lua/index_random_test.lua lua/push.lua
--- a/test/big/tree_pk.test
+++ b/test/big/tree_pk.test
--- a/test/big/tree_pk_multipart.test
+++ b/test/big/tree_pk_multipart.test
--- a/test/big/tree_variants.test
+++ b/test/big/tree_variants.test
--- a/test/box/admin.test
+++ b/test/box/admin.test
--- a/test/box_lua/admin_coredump.result
+++ b/test/box_lua/admin_coredump.result
--- a/test/box_lua/admin_coredump.test
+++ b/test/box_lua/admin_coredump.test
--- a/test/box/args.test
+++ b/test/box/args.test
--- a/test/box_lua/cjson.result
+++ b/test/box_lua/cjson.result
--- a/test/box_lua/cjson.test
+++ b/test/box_lua/cjson.test
--- a/test/box/configuration.test
+++ b/test/box/configuration.test
--- a/test/box_lua/errinj.result
+++ b/test/box_lua/errinj.result
--- a/test/box_lua/errinj.test
+++ b/test/box_lua/errinj.test