jsteemann a495dc9835 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types		2016-09-07 18:04:57 +02:00
..
AffinityFeature.cpp	…
AffinityFeature.h	…
BootstrapFeature.cpp	Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types	2016-09-07 18:04:57 +02:00
BootstrapFeature.h	…
CheckVersionFeature.cpp	…
CheckVersionFeature.h	…
ConsoleFeature.cpp	…
ConsoleFeature.h	…
ConsoleThread.cpp	…
ConsoleThread.h	…
DatabaseFeature.cpp	removed VocbaseCollectionInfo	2016-09-02 09:41:36 +02:00
DatabaseFeature.h	removed VocbaseCollectionInfo	2016-09-02 09:41:36 +02:00
DatabasePathFeature.cpp	…
DatabasePathFeature.h	…
EndpointFeature.cpp	…
EndpointFeature.h	…
FileDescriptorsFeature.cpp	…
FileDescriptorsFeature.h	…
FrontendFeature.cpp	…
FrontendFeature.h	…
InitDatabaseFeature.cpp	…
InitDatabaseFeature.h	…
LockfileFeature.cpp	…
LockfileFeature.h	…
QueryRegistryFeature.cpp	…
QueryRegistryFeature.h	…
ScriptFeature.cpp	…
ScriptFeature.h	…
ServerFeature.cpp	…
ServerFeature.h	…
ServerIdFeature.cpp	…
ServerIdFeature.h	…
TraverserEngineRegistryFeature.cpp	Merge branch 'MIT' of github.com:arangodb/arangodb into generic-col-types	2016-09-06 09:33:23 +02:00
TraverserEngineRegistryFeature.h	Merge branch 'MIT' of github.com:arangodb/arangodb into generic-col-types	2016-09-06 09:33:23 +02:00
UnitTestsFeature.cpp	…
UnitTestsFeature.h	…
UpgradeFeature.cpp	…
UpgradeFeature.h	…
VocbaseContext.cpp	…
VocbaseContext.h	…
WorkMonitorFeature.cpp	…
WorkMonitorFeature.h	…
arangod.cpp	Merge branch 'MIT' of github.com:arangodb/arangodb into generic-col-types	2016-09-06 09:33:23 +02:00