merge latest develop

vanajamukkara · vanajamukkara · commit 8aa70481fa13 · 2019-03-04T13:27:17.000-08:00
diff --git a/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java b/integration-tests/src/test/java/oracle/kubernetes/operator/utils/Operator.java
@@ -315,8 +315,8 @@ private void generateInputYaml() throws Exception {
     logger.info("Invoking " + sb.toString());
     ExecCommand.exec(sb.toString());
 
-    String content = new String(Files.readAllBytes(Paths.get(generatedInputYamlFile)));
-    logger.info("Content of weblogic-operator-values.yaml \n" + content);
+    /* String content = new String(Files.readAllBytes(Paths.get(generatedInputYamlFile)));
+    logger.info("Content of weblogic-operator-values.yaml \n" + content); */
   }
 
   private void runCommandInLoop(String command) throws Exception {

Original file line number	Diff line number	Diff line change
`@@ -315,8 +315,8 @@ private void generateInputYaml() throws Exception {`
`315`	`315`	`logger.info("Invoking " + sb.toString());`
`316`	`316`	`ExecCommand.exec(sb.toString());`
`317`	`317`
`318`		`- String content = new String(Files.readAllBytes(Paths.get(generatedInputYamlFile)));`
`319`		`- logger.info("Content of weblogic-operator-values.yaml \n" + content);`
	`318`	`+ /* String content = new String(Files.readAllBytes(Paths.get(generatedInputYamlFile)));`
	`319`	`+ logger.info("Content of weblogic-operator-values.yaml \n" + content); */`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`private void runCommandInLoop(String command) throws Exception {`