Merged into master and stable-2.6, thanks! Mathieu
----- Original Message ----- > From: "Jérémie Galarneau" <[email protected]> > To: [email protected] > Cc: "mathieu desnoyers" <[email protected]>, "Jérémie Galarneau" > <[email protected]> > Sent: Monday, February 23, 2015 4:22:53 PM > Subject: [PATCH lttng-ust] Fix: Mismatching code and console output in log4j > example > > Signed-off-by: Jérémie Galarneau <[email protected]> > --- > doc/examples/java-log4j/Hello.java | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/doc/examples/java-log4j/Hello.java > b/doc/examples/java-log4j/Hello.java > index a0105ad..083ec12 100644 > --- a/doc/examples/java-log4j/Hello.java > +++ b/doc/examples/java-log4j/Hello.java > @@ -48,7 +48,7 @@ public class Hello > /* Trigger a tracing event using the JUL Logger created before. > */ > helloLog.info("Hello World, the answer is " + answer); > > - System.out.println("Firing hello delay in 10 seconds..."); > + System.out.println("Firing hello delay in 5 seconds..."); > Thread.sleep(5000); > helloLog.info("Hello World delayed..."); > } > -- > 2.3.0 > > -- Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
