1
0
Fork 0
arangodb/arangod
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
..
Actions finish RequestType enum 2016-08-23 14:49:29 +02:00
Agency Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:51:09 +02:00
Aql removed TRI_collection_t 2016-09-02 14:54:13 +02:00
Cluster Improve version handling in ClusterInfo. 2016-09-05 16:03:28 +02:00
Dispatcher fix invalid check 2016-09-05 11:01:56 +02:00
FulltextIndex added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
GeneralServer Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:51:09 +02:00
GeoIndex renamed GeoIndex2 to GeoIndex 2016-08-29 13:02:07 +02:00
Indexes fixed index creation & validation 2016-09-05 11:42:44 +02:00
ReadCache changes for Visual Studio 2016-08-19 17:22:57 +02:00
Replication make error message unambiguous 2016-09-05 13:55:04 +02:00
Rest
RestHandler begin to fix RestReplicationHandler 2016-09-05 16:39:42 +02:00
RestServer removed VocbaseCollectionInfo 2016-09-02 09:41:36 +02:00
Scheduler prealloc _readBuffer 2016-09-02 17:01:43 +02:00
Statistics Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:51:09 +02:00
StorageEngine fixed compile warning 2016-09-02 16:29:19 +02:00
Utils removed TRI_collection_t 2016-09-02 14:54:13 +02:00
V8Server remove comments 2016-09-05 16:39:05 +02:00
VocBase micro optimizations 2016-09-05 11:14:17 +02:00
Wal removed TRI_collection_t 2016-09-02 14:54:13 +02:00
CMakeLists.txt Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:42:58 +02:00