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

zoudaokoulife · zoudaokoulife · commit c5c26567eef5 · 2018-10-11T17:41:17.000+08:00
diff --git a/launcher/.gitignore b/launcher/.gitignore
@@ -10,3 +10,4 @@ target/
 plugins/
 lib/
 dependency-reduced-pom.xml
+.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
@@ -39,7 +39,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 number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`* The Parser of Launcher commandline options`
`40`	`40`	`*`
`41`	`41`	`* Company: www.dtstack.com`
`42`		`- * @author [email protected]`
	`42`	`+ * @author sishu.yss`
`43`	`43`	`*/`
`44`	`44`	`public class LauncherOptionParser {`
`45`	`45`