From ef62f45a9e3f3f6c6ec55c00b0e17f3b29b95ab2 Mon Sep 17 00:00:00 2001 From: Tim Vaillancourt Date: Wed, 25 Sep 2024 17:06:01 +0200 Subject: [PATCH] fix conflict Signed-off-by: Tim Vaillancourt --- ...upgrade_downgrade_test_query_serving_queries_next_release.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml b/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml index c31f2e70742..d80d333dbca 100644 --- a/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml +++ b/.github/workflows/upgrade_downgrade_test_query_serving_queries_next_release.yml @@ -165,7 +165,6 @@ jobs: source build.env eatmydata -- go run test.go -skip-build -keep-data=false -docker=false -print-log -follow -tag upgrade_downgrade_query_serving_queries ->>>>>>> parent of 25a80acbfd ([release-19.0] Improve the queries upgrade/downgrade CI workflow by using same test code version as binary (#16494) (#16501)) # Swap the binaries in the bin. Use vtgate version n+1 and keep vttablet at version n - name: Use next release's VTGate