Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 24978F2C7 for ; Fri, 14 Nov 2014 16:23:37 +0000 (UTC) Received: (qmail 8766 invoked by uid 500); 14 Nov 2014 16:23:37 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 8708 invoked by uid 500); 14 Nov 2014 16:23:37 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 8699 invoked by uid 99); 14 Nov 2014 16:23:37 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Nov 2014 16:23:37 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id A7394940F51; Fri, 14 Nov 2014 16:23:36 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergeyb@apache.org To: commits@cxf.apache.org Date: Fri, 14 Nov 2014 16:23:37 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/855ab395 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/855ab395 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/855ab395 Branch: refs/heads/master Commit: 855ab395bd2916ee5d1d9cfeeea2a346a052179e Parents: a124380 2d13112 Author: Sergey Beryozkin Authored: Fri Nov 14 16:23:21 2014 +0000 Committer: Sergey Beryozkin Committed: Fri Nov 14 16:23:21 2014 +0000 ---------------------------------------------------------------------- .../websocket/src/main/resources/index.html | 8 +- .../samples/logbrowser-blueprint/README.txt | 7 + .../src/test/resources/index_plain.html | 211 +++++++++++++++++++ 3 files changed, 222 insertions(+), 4 deletions(-) ----------------------------------------------------------------------