1
0
Fork 0
arangodb/lib
Jan Christoph Uhde d0fdfa727a Merge branch 'generic-col-types' of github.com:arangodb/arangodb into obi-velocystream
* '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
2016-09-05 16:42:41 +02:00
..
ApplicationFeatures Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 17:59:54 +02:00
Basics removed unused error codes 2016-09-02 15:36:59 +02:00
Endpoint
Logger fix some shutdown issues 2016-09-01 17:43:32 +02:00
Meta fist changes to get request agents working 2016-08-25 13:28:19 +02:00
ProgramOptions Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +02:00
Random
Rest Merge branch 'generic-col-types' of github.com:arangodb/arangodb into obi-velocystream 2016-09-05 16:42:41 +02:00
SimpleHttpClient Merge branch 'devel' into obi-velocystream-try-merge-devel 2016-08-30 22:04:31 +02:00
Ssl Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-24 09:38:06 +02:00
Utilities
V8 Merge branch 'devel' into obi-velocystream-try-merge-devel 2016-08-30 22:04:31 +02:00
Zip
CMakeLists.txt