faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

Merge branch 'refs/heads/master' into 0.2-beta

Browse Source 
Conflicts:
	composer.lock
	src/Ratchet/ConnectionInterface.php
This commit is contained in:
Chris Boden 2012-07-12 20:00:03 -04:00
commit 54b072884c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/ab-wstest-fuzzyconf.json
View File

@ -3,8 +3,8 @@
, "outdir": "../reports/ab" , "outdir": "../reports/ab"
, "servers": [ , "servers": [
{"agent": "Ratchet-libevent/v0.2b", "url": "ws://localhost:8000", "options": {"version": 18}} {"agent": "Ratchet-libevent/v0.1.5", "url": "ws://localhost:8000", "options": {"version": 18}}
, {"agent": "Ratchet-stream/v0.2b", "url": "ws://localhost:8001", "options": {"version": 18}} , {"agent": "Ratchet-stream/v0.1.5", "url": "ws://localhost:8001", "options": {"version": 18}}
] ]
, "cases": ["*"] , "cases": ["*"]