* 'generic-col-types' of github.com:arangodb/arangodb: (168 commits)
fix memleak
Fixed shutdown of Traversal Blocks in Cluster
restructuring agent wakeup
remove visibility
Traverser engine now unlocks all it's shards
handle 0 values
added HTTP REST APIs for online loglevel adjustments:
move json-utilities to the place where it is solely used
too verbose messages from cluster.js
unify exception debugging
Improved shutdown process of Graph Traverser Engines. This state causes a double free. Merge commit.
silenced cppcheck warning
silenced cppcheck warning
silenced warning in maintainer-mode
allow inline suppression
give more debug info
cosmetics
properly free EngineInfo
fix memleak
fix some leaks
...
* '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