4 Commits

Author	SHA1	Message	Date
Frank Celler	d26b082ef6	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel ... Conflicts: CHANGELOG Makefile.in UnitTests/Makefile.files	2012-08-24 09:59:16 +02:00
Jan Steemann	4b16882b44	issue #131: make keep alive timeout configurable	2012-08-20 15:42:11 +02:00
Frank Celler	fa41864b7a	Merge remote-tracking branch 'origin/1.0' into devel ... Conflicts: Installation/MacOSX/MacPorts/arango.conf Installation/arangod.conf.in Makefile.in arangod/RestServer/ArangoServer.h configure lib/V8/v8-utils.cpp	2012-08-18 09:00:43 +02:00
Jan Steemann	acdfbf8a20	more refactoring	2012-07-30 15:37:54 +02:00