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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2015-12-03 13:46:23 +01:00
parent ec3ab298e1 2377c4d628
commit 46f1e4624d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/CMakeLists.txt
View File

@ -112,6 +112,7 @@ add_executable(
Aql/SortNode.cpp
Aql/SubqueryBlock.cpp
Aql/tokens.cpp
Aql/TraversalConditionFinder.cpp
Aql/TraversalBlock.cpp
Aql/TraversalNode.cpp
Aql/V8Expression.cpp
@ -122,6 +123,7 @@ add_executable(
Cluster/ApplicationCluster.cpp
Cluster/ClusterComm.cpp
Cluster/ClusterInfo.cpp
Cluster/ClusterTraverser.cpp
Cluster/ClusterMethods.cpp
Cluster/HeartbeatThread.cpp
Cluster/RestShardHandler.cpp