Syncup with develop branch again after a merge jenkins-ignore

hzhao-github · hzhao-github · commit 4977581ef630 · 2019-05-08T15:55:16.000-07:00
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/ITElasticLogging.java b/integration-tests/src/test/java/oracle/kubernetes/operator/ITElasticLogging.java
@@ -286,7 +286,7 @@ private static String execElasticStackStatusCheck(String indexName, String varLo
             .toString();
     logger.info("Command to exec Elastic Stack status check: " + cmd);
     ExecResult result = TestUtils.exec(cmd);
-    logger.info(result.stdout());
+    logger.info("Results: " + result.stdout());
 
     return result.stdout();
   }

Original file line number	Diff line number	Diff line change
`@@ -286,7 +286,7 @@ private static String execElasticStackStatusCheck(String indexName, String varLo`
`286`	`286`	`.toString();`
`287`	`287`	`logger.info("Command to exec Elastic Stack status check: " + cmd);`
`288`	`288`	`ExecResult result = TestUtils.exec(cmd);`
`289`		`- logger.info(result.stdout());`
	`289`	`+ logger.info("Results: " + result.stdout());`
`290`	`290`
`291`	`291`	`return result.stdout();`
`292`	`292`	`}`