Merge remote-tracking branch 'origin/v1.4.1' into v1.4.1

zoudaokoulife · zoudaokoulife · commit 7a0d7c213fb2 · 2018-10-11T17:53:06.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ target/
 *.iml
 plugins/
 lib/
+.vertx/
diff --git a/launcher/src/main/java/com/dtstack/flink/sql/launcher/LauncherOptionParser.java b/launcher/src/main/java/com/dtstack/flink/sql/launcher/LauncherOptionParser.java
@@ -37,7 +37,7 @@
  * The Parser of Launcher commandline options
  *
  * Company: www.dtstack.com
- * @author huyifan.zju@163.com
+ * @author sishu.yss
  */
 public class LauncherOptionParser {
 

-Original file line number
+Diff line change
 *.iml
 plugins/
 lib/
 +.vertx/
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`* The Parser of Launcher commandline options`
`38`	`38`	`*`
`39`	`39`	`* Company: www.dtstack.com`
`40`		`- * @author [email protected]`
	`40`	`+ * @author sishu.yss`
`41`	`41`	`*/`
`42`	`42`	`public class LauncherOptionParser {`
`43`	`43`