Merge branch 'CAMEL-7574' of https://github.com/kevinearls/camel
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/527ce6c7 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/527ce6c7 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/527ce6c7 Branch: refs/heads/master Commit: 527ce6c7b68e85caae3fcbceffdcd49f7690ec29 Parents: 4f393f3 9e773d8 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Jul 3 13:17:26 2014 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Jul 3 13:17:26 2014 +0200 ---------------------------------------------------------------------- .../apache/camel/impl/DefaultCamelContext.java | 2 + .../websocket/WebsocketComponent.java | 1 + .../atmosphere/websocket/WebsocketEndpoint.java | 5 ++ ...ponentConfigurationAndDocumentationTest.java | 58 ++++++++++++++++++++ 4 files changed, 66 insertions(+) ----------------------------------------------------------------------
