Simon Grätzer 13f19fe51b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel ... # Conflicts: # arangod/CMakeLists.txt # arangod/RestServer/arangod.cpp # arangod/Utils/ExplicitTransaction.h # arangod/V8Server/v8-collection.cpp		2017-02-02 11:25:23 +01:00
..
FoxxQueuesFeature.cpp	…
FoxxQueuesFeature.h	…
V8Context.cpp	…
V8Context.h	…
V8DealerFeature.cpp	renaming	2017-01-16 14:48:13 +01:00
V8DealerFeature.h	…
V8Traverser.cpp	…
V8Traverser.h	…
v8-actions.cpp	…
v8-actions.h	…
v8-collection-util.cpp	…
v8-collection.cpp	Merge branch 'devel' of https://github.com/arangodb/arangodb into devel	2017-02-02 11:25:23 +01:00
v8-collection.h	…
v8-dispatcher.cpp	Fix bugs of threads not announcing that they are busy.	2017-01-31 14:07:54 +01:00
v8-dispatcher.h	…
v8-query.cpp	Moved knowledge of StorageEngine out of some V8-Related files. JS_Near and JS_Within will now directly use AQL. The existing index check was deleted.	2017-01-25 16:15:35 +01:00
v8-query.h	…
v8-replication.cpp	moved files into engine directory	2017-01-23 13:52:57 +01:00
v8-replication.h	…
v8-statistics.cpp	improved statistics	2017-01-26 23:43:27 +01:00
v8-statistics.h	…
v8-user-structures.cpp	…
v8-user-structures.h	…
v8-util.cpp	…
v8-vocbase.cpp	fix lock timeout calculation	2017-01-28 00:05:34 +01:00
v8-vocbase.h	…
v8-vocbaseprivate.h	…
v8-voccursor.cpp	…
v8-voccursor.h	…
v8-vocindex.cpp	Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api	2017-01-30 12:53:10 +01:00
v8-vocindex.h	…