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 <sberyoz...@talend.com> Authored: Fri Nov 14 16:23:21 2014 +0000 Committer: Sergey Beryozkin <sberyoz...@talend.com> 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(-) ----------------------------------------------------------------------
