Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2016-02-26 08:54:13 +00:00
parent 7c2979275d 421df55e89
commit 40bcc22eb0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -569,5 +569,8 @@ add_dependencies(arangodump zlibstatic v8_build)
add_dependencies(arangoimp zlibstatic v8_build) add_dependencies(arangoimp zlibstatic v8_build)
add_dependencies(arangorestore zlibstatic v8_build) add_dependencies(arangorestore zlibstatic v8_build)
add_dependencies(arangosh zlibstatic v8_build) add_dependencies(arangosh zlibstatic v8_build)
add_dependencies(basics_suite v8_build)
add_dependencies(geo_suite v8_build) if (USE_BOOST_UNITTESTS)
add_dependencies(basics_suite v8_build)
add_dependencies(geo_suite v8_build)
endif ()

2
etc/relative/arangod.conf
View File

@ -5,7 +5,7 @@
[server] [server]
disable-authentication = true disable-authentication = true
endpoint = tcp://0.0.0.0:8529 endpoint = tcp://0.0.0.0:8529
threads = 4 threads = 8
# reuse-address = false # reuse-address = false
[scheduler] [scheduler]