github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

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

pull/58/head
Darien Raymond 2015-12-07 19:32:48 +00:00
parent af8412175e a1ba0eb413
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,
"log": {
"access": "access.log",
"error": "error.log",
"access": "/tmp/v2ray_access.log",
"error": "/tmp/v2ray_error.log",
"loglevel": "error"
},
"inbound": {

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

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