Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 6313E200D0E for ; Tue, 26 Sep 2017 21:17:26 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 618FD1609EA; Tue, 26 Sep 2017 19:17:26 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CD5F51609D7 for ; Tue, 26 Sep 2017 21:17:25 +0200 (CEST) Received: (qmail 76994 invoked by uid 500); 26 Sep 2017 19:17:25 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 76983 invoked by uid 99); 26 Sep 2017 19:17:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 26 Sep 2017 19:17:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CC636F578F; Tue, 26 Sep 2017 19:17:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: clebertsuconic@apache.org To: commits@activemq.apache.org Date: Tue, 26 Sep 2017 19:17:25 -0000 Message-Id: <93e45f4c16fc4f3dbfd5a380fdfce911@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] activemq-artemis git commit: This closes #1554 archived-at: Tue, 26 Sep 2017 19:17:26 -0000 This closes #1554 Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/0e655f9a Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/0e655f9a Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/0e655f9a Branch: refs/heads/master Commit: 0e655f9a8e456d1828141300abdd3791532d5d5f Parents: 24e18fd abcf4b7 Author: Clebert Suconic Authored: Tue Sep 26 15:17:08 2017 -0400 Committer: Clebert Suconic Committed: Tue Sep 26 15:17:08 2017 -0400 ---------------------------------------------------------------------- .../core/remoting/impl/netty/TransportConstants.java | 5 +++++ .../activemq/artemis/core/protocol/ProtocolHandler.java | 10 +++------- .../artemis/core/remoting/impl/netty/NettyAcceptor.java | 2 +- .../server/protocol/websocket/WebSocketServerHandler.java | 6 ++++-- docs/user-manual/en/protocols-interoperability.md | 5 +++++ 5 files changed, 18 insertions(+), 10 deletions(-) ----------------------------------------------------------------------