Merge branch 'wicket-6.x' into wicket-atmosphere-tester
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6a294f38 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6a294f38 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6a294f38 Branch: refs/heads/wicket-atmosphere-tester Commit: 6a294f38cdc663a98fa1b45c5a06aa00d1d2ad1f Parents: 2a123ae b26481d Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Thu Aug 14 15:22:26 2014 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Thu Aug 14 15:22:26 2014 +0200 ---------------------------------------------------------------------- .../atmosphere/AtmosphereRequestHandler.java | 18 +++++++++++++++--- .../org/apache/wicket/atmosphere/EventBus.java | 16 ++++++++++++++++ 2 files changed, 31 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/6a294f38/wicket-experimental/wicket-atmosphere/src/main/java/org/apache/wicket/atmosphere/EventBus.java ----------------------------------------------------------------------
