1
0
Fork 0
arangodb/js/server
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
2014-02-27 09:13:03 +01:00
..
bootstrap mount default apps in /system 2014-01-28 14:34:49 +01:00
modules/org Merge remote-tracking branch 'origin/1.4' into devel 2014-02-27 09:13:03 +01:00
tests added SHORTEST_PATH AQL function, fixed bug in Graph.pathTo 2014-02-26 13:34:42 +01:00
arango-dfdb.js removed unused variables 2013-11-18 11:22:09 +01:00
server.js added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00
version-check.js added periodic tasks and statistics historian 2014-02-20 20:29:55 +01:00