Home Explore Help
Register Sign In
HarrisonT
/
DataCenterCDC-DS
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

1. change windows new line 'CR' to linux new line 'LF'
2. solve conflict

simon824 4 years ago
parent
0b11275880
commit
65841a5709
4 changed files with 187 additions and 8 deletions
Split View Show Diff Stats
  1. 61 1
      dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillRequestCommand.java
  2. 119 1
      dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java
  3. 6 6
      dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sqoop/SqoopTaskTest.java
  4. 1 0
      pom.xml

File diff suppressed because it is too large
+ 61 - 1
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillRequestCommand.java


File diff suppressed because it is too large
+ 119 - 1
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/TaskKillResponseCommand.java


File diff suppressed because it is too large
+ 6 - 6
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sqoop/SqoopTaskTest.java


+ 1 - 0
pom.xml
View File 

@@ -815,6 +815,7 @@
 
                         <include>**/server/worker/task/spark/SparkTaskTest.java</include>
 
                         <include>**/server/worker/task/EnvFileTest.java</include>
 
                         <include>**/server/worker/task/spark/SparkTaskTest.java</include>
 
+                        <include>**/server/worker/task/datax/DataxTaskTest.java</include>
 
                         <include>**/server/worker/task/sqoop/SqoopTaskTest.java</include>
 
                         <include>**/server/worker/EnvFileTest.java</include>
 
                         <include>**/service/quartz/cron/CronUtilsTest.java</include>