You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2016/07/15 09:57:46 UTC
camel git commit: Fix lumberjack doc + Fix flaky test
Repository: camel
Updated Branches:
refs/heads/master 7cd38e565 -> f605d01ce
Fix lumberjack doc + Fix flaky test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f605d01c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f605d01c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f605d01c
Branch: refs/heads/master
Commit: f605d01ce2bbf92d3693cc4ac49eb302db8cf053
Parents: 7cd38e5
Author: Antoine DESSAIGNE <an...@gmail.com>
Authored: Fri Jul 15 11:10:39 2016 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Jul 15 11:56:29 2016 +0200
----------------------------------------------------------------------
components/camel-lumberjack/src/main/docs/lumberjack.adoc | 2 +-
.../java/org/apache/camel/component/lumberjack/LumberjackUtil.java | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/f605d01c/components/camel-lumberjack/src/main/docs/lumberjack.adoc
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/main/docs/lumberjack.adoc b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
index bc92bbd..7d560cb 100644
--- a/components/camel-lumberjack/src/main/docs/lumberjack.adoc
+++ b/components/camel-lumberjack/src/main/docs/lumberjack.adoc
@@ -6,7 +6,7 @@ Lumberjack Component
The *Lumberjack* component retrieves logs sent over the network using the Lumberjack protocol,
from https://www.elastic.co/fr/products/beats/filebeat[Filebeat] for instance.
-The network communication can be secured with SSL using the `lumberjacks` component.
+The network communication can be secured with SSL.
This component only supports consumer endpoints.
http://git-wip-us.apache.org/repos/asf/camel/blob/f605d01c/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
----------------------------------------------------------------------
diff --git a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
index 2dcfbbb..397f254 100644
--- a/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
+++ b/components/camel-lumberjack/src/test/java/org/apache/camel/component/lumberjack/LumberjackUtil.java
@@ -82,6 +82,7 @@ final class LumberjackUtil {
.connect("127.0.0.1", port).sync().channel(); //
// Send the 2 window frames
+ TimeUnit.MILLISECONDS.sleep(100);
channel.writeAndFlush(readSample("io/window10"));
TimeUnit.MILLISECONDS.sleep(100);
channel.writeAndFlush(readSample("io/window15"));