From commits-return-35341-archive-asf-public=cust-asf.ponee.io@karaf.apache.org Sun Dec 9 15:53:27 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 32DAC180676 for ; Sun, 9 Dec 2018 15:53:27 +0100 (CET) Received: (qmail 89253 invoked by uid 500); 9 Dec 2018 14:53:26 -0000 Mailing-List: contact commits-help@karaf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@karaf.apache.org Delivered-To: mailing list commits@karaf.apache.org Received: (qmail 89244 invoked by uid 99); 9 Dec 2018 14:53:26 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 09 Dec 2018 14:53:26 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 90AB482F19; Sun, 9 Dec 2018 14:53:25 +0000 (UTC) Date: Sun, 09 Dec 2018 14:53:26 +0000 To: "commits@karaf.apache.org" Subject: [karaf] 01/01: Merge pull request #691 from jbonofre/KARAF-6042 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit From: jbonofre@apache.org In-Reply-To: <154436720544.24508.10171484935952425657@gitbox.apache.org> References: <154436720544.24508.10171484935952425657@gitbox.apache.org> X-Git-Host: gitbox.apache.org X-Git-Repo: karaf X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Rev: 04d8789b2562fab130f8e7db59ab1a2115f0fbdf X-Git-NotificationType: diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated Message-Id: <20181209145325.90AB482F19@gitbox.apache.org> This is an automated email from the ASF dual-hosted git repository. jbonofre pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/karaf.git commit 04d8789b2562fab130f8e7db59ab1a2115f0fbdf Merge: 4ff103e cf87104 Author: Jean-Baptiste Onofré AuthorDate: Sun Dec 9 15:53:21 2018 +0100 Merge pull request #691 from jbonofre/KARAF-6042 [KARAF-6042] Fix flaky WebSocketExampleTest (if the http service takes time to startup) .../org/apache/karaf/itests/examples/WebSocketExampleTest.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)