* 'generic-col-types' of github.com:arangodb/arangodb:
Improve version handling in ClusterInfo.
Add further logging where a bug is likely.
make error message unambiguous
Conflicts:
lib/Rest/HttpResponse.cpp
* origin/generic-col-types: (124 commits)
fixed invalid read
fixed index creation & validation
Added missing classes
micro optimizations
Added a try catch in loadPlan. If the agency for some reason contains invalid collection information the coordinator will not break down, instead it will ignore the invalid collection and continue.
looks good for dangling creation of shards
respond with proper error message in case queue is full
fix invalid check
fixed figures() call
half way through unassumed leadership
prealloc _readBuffer
fixed compile warning
work less on the heap
removed unused error codes
removed TRI_collection_t
removed bug into failedserver
Create apps directory before starting the instance.
Add instance info & port sniffing template
fixed issue #2034
privatized some members
...
Conflicts:
lib/Rest/HttpResponse.cpp
* obi-velocystream: (34 commits)
add flags only for gcc as they are meaningless for clang
update my scripts
renamed method
fixed some tests
fix RestExportHandler
fix: RestcursorHandler
minor fixes
fix effect that on second install we will complain about mismatching passwords
only test for cleaning up 3rdparty if we're parametrized to do so.
add vpack version of cursor.dump()
fix CMake so it finds the PythonInterpreter even with oder versions
hexify corrupted markers
Fix comments
fixed cluster start
some preparation work for response generalization
removed obsolete comment
use Buffer.append() instead of memcpy
issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
fixed issue #2023: added replicationFactor to docs
improve the perf script
...
Conflicts:
lib/Rest/GeneralResponse.cpp
lib/Rest/GeneralResponse.h
* obi-velocystream-attribute-translator:
add options to Slice::get and use them for VPackHeader
add translator to VelocyPackHelper and headerOption to Vpp Protocol
Conflicts:
arangod/GeneralServer/VppCommTask.cpp
lib/Rest/CommonDefines.h
* origin/engine-vs-velocystream: (91 commits)
removed useless include
removed JsonParser
removed JsonHelper
Fixed another failed nullptr handling in LogicalCollection cluster case.
Fixed undefined behaviour in rest error creation
Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
agency startup changed to bootstrapping
Mention howto control core files on linux.
shutdown fixed
Removed create / drop system collection from Cluster test. This is forbidden now
The logical colleciton now knows it's journalSize
Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
pushing corrected unittest script and cluster startup scripts
adjusting startup scripts
missing source file added
we have a bootstrapping agency
votes are processed correctly again
Add module.context.createDocumentationRouter
Don't implicitely build the windows packages.
remove debug print
...
Conflicts:
arangod/Cluster/ClusterComm.cpp
arangod/GeneralServer/VppCommTask.h
arangod/RestHandler/RestBaseHandler.cpp
lib/Rest/VppRequest.h
Jan Christoph Uhde
Max Neunhoeffer
jsteemann
Mark
Michael Hackstein