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

DTStack · Oct 11, 2018 · c5c2656 · c5c2656
2 parents 766d74d + 81bb460
commit c5c2656
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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 [email protected]
+ * @author sishu.yss
  */
 public class LauncherOptionParser {
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ target/ @@
     plugins/
     lib/
     dependency-reduced-pom.xml
+    .vertx/