1
0
Fork 0
arangodb/arangod/RestServer
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
2016-04-19 07:44:00 +02:00
..
AffinityFeature.cpp WIP 2016-04-15 23:04:32 -07:00
AffinityFeature.h WIP 2016-04-13 12:30:18 +02:00
ArangoServer.cpp Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 2016-04-19 07:44:00 +02:00
ArangoServer.h Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
CheckVersionFeature.cpp WIP 2016-04-11 00:05:37 +02:00
CheckVersionFeature.h WIP 2016-04-12 20:27:46 +02:00
ConsoleFeature.cpp WIP 2016-04-13 12:30:18 +02:00
ConsoleFeature.h WIP 2016-04-13 12:30:18 +02:00
ConsoleThread.cpp fixed error message 2016-04-17 00:02:00 +02:00
ConsoleThread.h added --console 2016-04-10 13:47:53 +02:00
DatabaseFeature.cpp WIP 2016-04-16 20:29:33 -07:00
DatabaseFeature.h WIP 2016-04-13 21:12:16 +02:00
EndpointFeature.cpp WIP 2016-04-15 22:09:55 -07:00
EndpointFeature.h WIP 2016-04-13 21:12:16 +02:00
FileDescriptorsFeature.cpp WIP 2016-04-13 12:30:18 +02:00
FileDescriptorsFeature.h WIP 2016-04-12 20:27:46 +02:00
FrontendFeature.cpp WIP 2016-04-13 12:30:18 +02:00
FrontendFeature.h WIP 2016-04-13 12:30:18 +02:00
RestServerFeature.cpp WIP 2016-04-15 22:09:55 -07:00
RestServerFeature.h WIP 2016-04-15 22:09:55 -07:00
ServerFeature.cpp WIP 2016-04-16 18:44:10 -07:00
ServerFeature.h WIP 2016-04-13 21:12:16 +02:00
UpgradeFeature.cpp WIP 2016-04-16 18:44:10 -07:00
UpgradeFeature.h WIP 2016-04-12 20:27:46 +02:00
V8ServerFeature.cpp WIP 2016-04-07 15:40:11 +02:00
VocbaseContext.cpp Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
VocbaseContext.h Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
WindowsServiceUtils.cpp Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
arangod.cpp Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
arangod_libarangod_a-ArangoServer.o-61d1e2e3