* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (29 commits)
removed define that was used only once
fix dumping of VPackSlices without CustomTypeHandler
remove includes
add no-throttling hint for compactor, too
remove function pointers from TRI_datafile_t, added constructor and destructor
moved functionality into engine
fixed tests
finalize classes
fix agency shutdown
cppcheck
cppcheck
fix agency shutdown
removed unused file
more diagnostic output
issue #2006: added more diagnostic output for some replication errors
allow dropping system collections in some rare cases
updated CHANGELOG
fixed issue #2012
explain why we fail to fetch the git revision.
Cleanup cmake process so it doesn't barf on problems to detect the git version.
...
* origin/devel: (23 commits)
Fix trusted origin tests
Fix CORS with credentials
New version of script.
updated CHANGELOG
grunt build [ci skip]
improved gv
added expand function to gv
enable: compile_commands.json
semistandard fix
improved gv
gv bugfix
updated license
improved gv
Adapting to 64 bit ARM architecture (aarch64) at the exceptions for TRI_PADDING_32
improved gv performance
fix handling of empty query strings
fixed query editor issues
Modularize perf script.
Add one more event.
Add a first perf probe monitoring script.
...
Conflicts:
arangod/GeneralServer/HttpCommTask.cpp
add .ctags_exclude and new CommTasks
move some code form GeneralCommTask to HttpCommTask
move more code into HttpCommTask
fix ording or initialization
if access of classes
make _requestAsHttp() private
more cleanup