lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 17:46:58 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of https://github.com/v2ray/v2ray-core

Browse Source
This commit is contained in:
Darien Raymond 2015-12-07 19:32:48 +00:00
commit a7c2425c9c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testing/scenarios/data/test_1_server.json
View File

@ -1,8 +1,8 @@
{ {
"port": 50001, "port": 50001,
"log": { "log": {
"access": "access.log", "access": "/tmp/v2ray_access.log",
"error": "error.log", "error": "/tmp/v2ray_error.log",
"loglevel": "error" "loglevel": "error"
}, },
"inbound": { "inbound": {

4
testing/scenarios/data/test_3_client.json
View File

@ -1,8 +1,8 @@
{ {
"port": 50020, "port": 50020,
"log": { "log": {
"access": "access.log", "access": "/tmp/v2ray_access_1.log",
"error": "error.log", "error": "/tmp/v2ray_error_1.log",
"loglevel": "error" "loglevel": "error"
}, },
"inbound": { "inbound": {