Frank Celler 1e25e5d262 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH ... Conflicts: arangod/Cluster/HeartbeatThread.cpp arangod/RestServer/RestServerFeature.cpp		2016-06-01 16:25:13 +02:00
..
FoxxQueuesFeature.cpp	friendlier error message when using a renamed option	2016-05-25 21:45:53 +02:00
FoxxQueuesFeature.h	…
V8Context.cpp	…
V8Context.h	…
V8DealerFeature.cpp	remove unnecessary checks	2016-05-30 14:45:11 +02:00
V8DealerFeature.h	…
V8Job.cpp	Fix a use after free for TRI_vocbase_t objects.	2016-05-26 22:59:34 +02:00
V8Job.h	…
V8PeriodicTask.cpp	added x-arango-start-thread header feature	2016-05-19 14:15:59 +02:00
V8PeriodicTask.h	…
V8QueueJob.cpp	…
V8QueueJob.h	…
V8TimerTask.cpp	added x-arango-start-thread header feature	2016-05-19 14:15:59 +02:00
V8TimerTask.h	…
V8Traverser.cpp	fixes for MSVC	2016-05-10 19:01:21 +02:00
V8Traverser.h	Merge branch 'devel' of github.com:arangodb/arangodb into devel	2016-05-03 09:23:22 +02:00
V8VPackWrapper.cpp	fixes for MSVC	2016-05-10 19:01:21 +02:00
V8VPackWrapper.h	…
v8-actions.cpp	WIP	2016-06-01 13:37:13 +02:00
v8-actions.h	…
v8-collection-util.cpp	…
v8-collection.cpp	Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH	2016-06-01 16:25:13 +02:00
v8-collection.h	…
v8-dispatcher.cpp	…
v8-dispatcher.h	…
v8-query.cpp	…
v8-query.h	…
v8-replication.cpp	…
v8-replication.h	…
v8-statistics.cpp	…
v8-statistics.h	…
v8-user-structures.cpp	…
v8-user-structures.h	…
v8-util.cpp	use StaticStrings	2016-05-10 17:01:34 +02:00
v8-vocbase.cpp	WIP	2016-06-01 15:57:28 +02:00
v8-vocbase.h	…
v8-vocbaseprivate.h	…
v8-voccursor.cpp	…
v8-voccursor.h	…
v8-vocindex.cpp	System collections now resilient. :-)	2016-05-20 12:53:39 +02:00
v8-vocindex.h	…