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/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-10-28 15:02:45 +01:00
parent 50f6129e47 3a313185d1
commit c03aa8bb5b
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/apps/system/gharial/gharial.js
View File

@ -447,6 +447,8 @@
* This has to contain the vertex-collection name.
*/
controller.post("/:graph/vertex", function(req, res) {
require("console").log("+++++++++++++++++++++++++");
require("console").log(req);
var name = req.params("graph");
var body = req.params("collection");
var g;
@ -751,7 +753,7 @@
/** Delete an edge definition.
*
* Removes an existing edge definition from this graph.
* All data stored in the collections is dropped as well as long
* All data stored in the edge collection is dropped as well as long
* as it is not used in other graphs.
*/
controller.del("/:graph/edge/:definition", function(req, res) {

2
scripts/run
View File

@ -21,5 +21,5 @@ for i in "$@"; do
done
echo Database has its data in data-$PID
echo Logfile is in log-$PID
$VG bin/arangod --configuration none --cluster.agent-path bin/etcd-arango --cluster.arangod-path bin/arangod --cluster.coordinator-config etc/relative/arangod-coordinator.conf --cluster.dbserver-config etc/relative/arangod-dbserver.conf --cluster.disable-dispatcher-frontend false --cluster.disable-dispatcher-kickstarter false --cluster.data-path cluster --cluster.log-path cluster --database.directory data-$PID --log.file log-$PID --server.endpoint tcp://localhost:$PORT --javascript.startup-directory js --javascript.app-path js/apps --javascript.script $SCRIPT --ruby.action-directory mr/actions/system --ruby.modules-path "mr/server/modules;mr/common/modules" "${ARGS[@]}" $VXML
$VG bin/arangod --configuration none --cluster.agent-path bin/etcd-arango --cluster.arangod-path bin/arangod --cluster.coordinator-config etc/relative/arangod-coordinator.conf --cluster.dbserver-config etc/relative/arangod-dbserver.conf --cluster.disable-dispatcher-frontend false --cluster.disable-dispatcher-kickstarter false --cluster.data-path cluster --cluster.log-path cluster --database.directory data-$PID --log.file log-$PID --server.endpoint tcp://localhost:$PORT --javascript.startup-directory js --javascript.app-path js/apps --javascript.script $SCRIPT --ruby.action-directory mr/actions/system --ruby.modules-path "mr/server/modules;mr/common/modules" "${ARGS[@]}" --temp-path /var/tmp/ $VXML
echo Server has terminated.