* 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