github
/
vitess-gh
зеркало из https://github.com/github/vitess-gh.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

resolve conflict (#12591) 

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
This commit is contained in:
Shlomi Noach 2023-03-09 16:10:35 +02:00 коммит произвёл GitHub
Родитель 1c2ed6b1b4
Коммит 5e9de1f9fe
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
1 изменённых файлов: 8 добавлений и 8 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

16
test/config.json
Просмотреть файл

@ -261,7 +261,7 @@
},
"onlineddl_ghost": {
"File": "unused.go",
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/ghost"],
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/ghost", "-timeout", "30m"],
"Command": [],
"Manual": false,
"Shard": "onlineddl_ghost",
@ -270,7 +270,7 @@
},
"onlineddl_vrepl": {
"File": "unused.go",
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/vrepl"],
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/vrepl", "-timeout", "30m"],
"Command": [],
"Manual": false,
"Shard": "onlineddl_vrepl",
@ -306,7 +306,7 @@
},
"onlineddl_revert": {
"File": "unused.go",
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/revert"],
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/revert", "-timeout", "30m"],
"Command": [],
"Manual": false,
"Shard": "onlineddl_revert",
@ -315,7 +315,7 @@
},
"onlineddl_revertible": {
"File": "unused.go",
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/revertible"],
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/revertible", "-timeout", "30m"],
"Command": [],
"Manual": false,
"Shard": "onlineddl_revertible",
@ -324,7 +324,7 @@
},
"onlineddl_declarative": {
"File": "unused.go",
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/declarative"],
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/declarative", "-timeout", "30m"],
"Command": [],
"Manual": false,
"Shard": "onlineddl_declarative",
@ -333,7 +333,7 @@
},
"onlineddl_singleton": {
"File": "unused.go",
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/singleton"],
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/singleton", "-timeout", "30m"],
"Command": [],
"Manual": false,
"Shard": "onlineddl_singleton",
@ -342,7 +342,7 @@
},
"onlineddl_scheduler": {
"File": "unused.go",
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/scheduler"],
"Args": ["vitess.io/vitess/go/test/endtoend/onlineddl/scheduler", "-timeout", "30m"],
"Command": [],
"Manual": false,
"Shard": "onlineddl_scheduler",
@ -351,7 +351,7 @@
},
"schemadiff_vrepl": {
"File": "unused.go",
"Args": ["vitess.io/vitess/go/test/endtoend/schemadiff/vrepl"],
"Args": ["vitess.io/vitess/go/test/endtoend/schemadiff/vrepl", "-timeout", "30m"],
"Command": [],
"Manual": false,
"Shard": "schemadiff_vrepl",