[flink] branch master updated: [hotfix] Remove legacy code which was not removed due merge conflicts

[zhuzh]

This is an automated email from the ASF dual-hosted git repository.

zhuzh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/master by this push:
     new 2ca7e411f53 [hotfix] Remove legacy code which was not removed due 
merge conflicts
2ca7e411f53 is described below

commit 2ca7e411f5341fdcfd65efb958f30756e9675e27
Author: Zhu Zhu <reed...@gmail.com>
AuthorDate: Mon Jan 30 17:04:32 2023 +0800

    [hotfix] Remove legacy code which was not removed due merge conflicts
---
 .../apache/flink/table/planner/runtime/batch/ParallelismSettingTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git 
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/batch/ParallelismSettingTest.java
 
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/batch/ParallelismSettingTest.java
index 1da85aac147..e5115a4d3e8 100644
--- 
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/batch/ParallelismSettingTest.java
+++ 
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/runtime/batch/ParallelismSettingTest.java
@@ -59,7 +59,6 @@ public class ParallelismSettingTest extends TableTestBase {
 
     @Test
     public void testParallelismSettingAfterSingletonShuffleRemove() {
-        
util.getStreamEnv().getConfig().setScheduler(SchedulerType.AdaptiveBatch);
         util.getTableEnv()
                 .executeSql(
                         "CREATE TABLE MySink (\n"