Jan Steemann 49cc332361 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh ... Conflicts: js/common/bootstrap/errors.js		2014-06-11 14:23:47 +02:00
..
bootstrap	wal flush	2014-06-11 09:32:20 +02:00
modules/org	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-11 14:23:47 +02:00
tests	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh	2014-06-11 14:23:47 +02:00
arango-dfdb.js	fixed dfdb	2014-06-04 11:02:42 +02:00
server.js	added gc for statistics	2014-05-25 23:10:56 +02:00
upgrade-check.js	cleanup of version-check, added option check-version	2014-06-01 13:37:21 +02:00
version-check.js	do not create _trx collection	2014-06-06 17:06:07 +02:00