Skip to content

Commit ee17739

Browse files
committed
Merge branch '1.10_release_4.0.x' into tmp_1.10_release_4.1.x
# Conflicts: # hbase/hbase-sink/src/main/java/com/dtstack/flink/sql/sink/hbase/HbaseOutputFormat.java # hbase/hbase-sink/src/main/java/com/dtstack/flink/sql/sink/hbase/HbaseSink.java
2 parents 8720578 + bd501e6 commit ee17739

5 files changed

Lines changed: 244 additions & 128 deletions

File tree

core/src/main/java/com/dtstack/flink/sql/parser/CreateTableParser.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import com.dtstack.flink.sql.util.DtStringUtil;
2222
import com.google.common.base.Preconditions;
2323
import com.google.common.collect.Maps;
24-
import org.apache.commons.lang3.StringUtils;
2524

2625
import java.util.List;
2726
import java.util.Map;

0 commit comments

Comments
 (0)