* '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
...
* origin/devel:
don't leak on help
Abort compilation process if the cmake configure run fails
|| exit 1
Handle 503 answer from dbservers properly
return service unavailable during shutdown
Add cxgcc snippets
fix users home directory.
Fix debian scripted password documentation.
slighty improved error handling in import API
fixed issue #2026
Fix release matching for alpha/beta versions
We mustn't use minuses in the releases since that will collide later on with packaging.
Pass arguments along to build.sh
Fix windows NSIS client package
fix typo
- properly use armhf for armv7 packages - specify CPACK_DEBIAN_PACKAGE_ARCHITECTURE so one can cx-compile packages.
Conflicts:
arangod/Cluster/ClusterComm.cpp
lib/Rest/FakeRequest.cpp
* devel: (24 commits)
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.
fix CMake so it finds the PythonInterpreter even with oder versions
hexify corrupted markers
Fix comments
fixed cluster start
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
fix perfsetupscript
clean up perf script
add SYSTEM flag to boost includes to avoid warnings
Adding Foxx access to agency
Adding Foxx access to agency
fix compile warning
Add missing windows library.
fix windows compile problems.
Fix syntax error in windows client installer.
If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
...
Conflicts:
arangod/Agency/AgentConfiguration.cpp
arangod/GeneralServer/HttpCommTask.cpp
arangod/RestServer/DatabaseFeature.cpp
arangod/VocBase/datafile.cpp
* '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.
...
* 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: (95 commits)
move it a class method
speed up compaction and cleanup a bit
privatization
added functions V8_TO_VPACK and VPACK_TO_V8
fixed compaction bug
fixed compaction bug
raft testing revealed performance optimisation in receiver and of appendentries
more streamlining, links to the UDF documentation.
refactoring
By simran: review UDF documentation.
Explain clustering impacts in the optimizer chapter.
fixed tests
WG beautification
Remove iconv-lite
Add iconv-lite and timezone
Add missing package description file.
compaction bug in agency
compaction bug in agency
compaction bug in agency
fixed compaction bug
...