[kafka] branch trunk updated: HOTFIX: Compilation error in CommandLineUtils (#6131)

[jgus]

This is an automated email from the ASF dual-hosted git repository.

jgus pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git


The following commit(s) were added to refs/heads/trunk by this push:
     new e120feb  HOTFIX: Compilation error in CommandLineUtils (#6131)
e120feb is described below

commit e120feb4859a502749d7de08f594fd7d1ba86bcf
Author: Jason Gustafson <ja...@confluent.io>
AuthorDate: Fri Jan 11 13:40:22 2019 -0800

    HOTFIX: Compilation error in CommandLineUtils (#6131)
    
    This was broken by #6084. The syntax works with Scala 2.12, but not 2.11.
    
    Reviewers: Colin Patrick McCabe <co...@cmccabe.xyz>
---
 core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala 
b/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala
index f49b69b..c573fce 100644
--- a/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala
+++ b/core/src/test/scala/unit/kafka/utils/CommandLineUtilsTest.scala
@@ -127,7 +127,7 @@ class CommandLineUtilsTest {
       "--str-opt", "some-string-2",
       "--int-opt", "700",
       "--str-opt-nodef", "some-string-3",
-      "--int-opt-nodef", "800",
+      "--int-opt-nodef", "800"
     )
 
     CommandLineUtils.maybeMergeOptions(props, "skey", options, stringOpt)
@@ -158,7 +158,7 @@ class CommandLineUtilsTest {
       "--str-opt",
       "--int-opt",
       "--str-opt-nodef",
-      "--int-opt-nodef",
+      "--int-opt-nodef"
     )
 
     CommandLineUtils.maybeMergeOptions(props, "sokey", options, 
stringOptOptionalArg)