1
0
Fork 0
arangodb/arangod/RestServer
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
..
BootstrapFeature.cpp moved LogfileManager into engine 2017-01-23 10:30:55 +01:00
BootstrapFeature.h
CheckVersionFeature.cpp fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
CheckVersionFeature.h
ConsoleFeature.cpp fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
ConsoleFeature.h
ConsoleThread.cpp properly honor CTRL-C 2016-11-21 11:57:17 +01:00
ConsoleThread.h
DatabaseFeature.cpp Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 00:33:42 +01:00
DatabaseFeature.h allow more control over handling of pre-3.1 _rev values 2016-11-04 23:17:01 +01:00
DatabasePathFeature.cpp fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
DatabasePathFeature.h
EndpointFeature.cpp fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
EndpointFeature.h
FeatureCacheFeature.cpp try to fix devel build 2016-12-16 17:10:44 +01:00
FeatureCacheFeature.h experimental micro optimizations 2016-12-16 15:52:16 +01:00
FileDescriptorsFeature.cpp
FileDescriptorsFeature.h
FrontendFeature.cpp
FrontendFeature.h
InitDatabaseFeature.cpp fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
InitDatabaseFeature.h
LockfileFeature.cpp fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
LockfileFeature.h
QueryRegistryFeature.cpp Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-30 12:53:10 +01:00
QueryRegistryFeature.h added startup option --query.memory-limit 2017-01-27 17:33:57 +01:00
ScriptFeature.cpp fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
ScriptFeature.h
ServerFeature.cpp Changed index-filling to dispatch batch insertion tasks to scheduler, obsoleted index-threads option. 2017-01-30 13:05:10 -05:00
ServerFeature.h Let AgencyComm timeout early, if server is already stopping. 2017-01-24 14:43:17 +01:00
ServerIdFeature.cpp fix --database.check-version on an empty directory 2016-11-02 16:55:27 +01:00
ServerIdFeature.h
TransactionManagerFeature.cpp factored out transaction manager from logfile manager 2017-01-23 12:31:45 +01:00
TransactionManagerFeature.h factored out transaction manager from logfile manager 2017-01-23 12:31:45 +01:00
TraverserEngineRegistryFeature.cpp moved LogfileManager into engine 2017-01-23 10:30:55 +01:00
TraverserEngineRegistryFeature.h
UnitTestsFeature.cpp fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
UnitTestsFeature.h
UpgradeFeature.cpp moved files into engine directory 2017-01-23 13:52:57 +01:00
UpgradeFeature.h
VocbaseContext.cpp Brake internal, authenticated cluster foxx requests again so we don't 2017-01-06 16:43:24 +01:00
VocbaseContext.h more style cleanup 2017-01-05 10:52:03 +01:00
WorkMonitorFeature.cpp
WorkMonitorFeature.h
arangod.cpp Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-02 11:25:23 +01:00