* 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
* '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.
...