[jetty-commit] [Git@Eclipse] Jetty: primary project repository branch je

[genie@xxxxxxxxxxx (Greg Wilkins)]

The branch, jetty-9-oneconnector has been updated
       via  f6d84d9f919a1f92c11007c302fbcda2e8effc38 (commit)
       via  e2dd62a3af198fbcfaf49e566dda6aff96514774 (commit)
       via  a638bbb850de68a5705feec5b5782c3b725fce03 (commit)
      from  53696692ecd8e76a631126755501b73231b4a1b0 (commit)


- Log -----------------------------------------------------------------
commit f6d84d9f919a1f92c11007c302fbcda2e8effc38
Merge: 5369669 e2dd62a
Author: Greg Wilkins <gregw@xxxxxxxxxxx>
Date:   Fri Aug 3 06:33:26 2012 +1000

    Merge branch 'jetty-9' into jetty-9-oneconnector

-----------------------------------------------------------------------

Summary of changes:
 .../websocket/driver/WebSocketEventDriver.java     |    4 +
 .../eclipse/jetty/websocket/protocol/OpCode.java   |    5 ++
 .../eclipse/jetty/websocket/protocol/Parser.java   |    2 +-
 .../jetty/websocket/protocol/WebSocketFrame.java   |    3 +-
 .../jetty/websocket/protocol/GeneratorTest.java    |   76 ++++++++++++++++++++
 .../websocket/protocol/IncomingFramesCapture.java  |   17 +++--
 .../websocket/server/DeflateExtensionTest.java     |    2 +-
 .../jetty/websocket/server/ab/AbstractABCase.java  |    5 ++
 .../eclipse/jetty/websocket/server/ab/Fuzzer.java  |   12 +++-
 .../jetty/websocket/server/ab/TestABCase1.java     |   12 ++--
 .../jetty/websocket/server/ab/TestABCase2.java     |    2 -
 .../jetty/websocket/server/ab/TestABCase5.java     |    4 +-
 .../server/blockhead/BlockheadClient.java          |   19 +++---
 .../server/helper/IncomingFramesCapture.java       |    3 +-
 .../src/test/resources/jetty-logging.properties    |    3 +-
 15 files changed, 136 insertions(+), 33 deletions(-)


hooks/post-receive
-- 
Jetty: primary project repository