Jan Steemann 580c15639f Merge branch 'devel' of https://github.com/arangodb/arangodb into collection-not-loaded ... Conflicts: CHANGELOG		2015-08-11 12:34:31 +02:00
..
Actions	moved dispatcher to atomic	2015-07-23 15:40:34 +02:00
Aql	some unused function cleanup	2015-08-06 21:25:32 +02:00
Cluster	Delete a TRI_vector_t usage.	2015-08-07 13:16:49 +02:00
FulltextIndex	some unused function cleanup	2015-08-06 21:25:32 +02:00
GeoIndex	move shaper to cxx	2015-07-28 17:38:31 +02:00
HashIndex	some unused function cleanup	2015-08-06 21:25:32 +02:00
IndexOperators	move shaper to cxx	2015-07-28 17:38:31 +02:00
Indexes	remove CONST_CAST helper	2015-08-07 13:18:21 +02:00
Replication	some cleanup	2015-08-07 15:16:33 +02:00
RestHandler	use unique_ptr	2015-08-07 16:48:35 +02:00
RestServer	Merge branch 'devel' of https://github.com/arangodb/arangodb into collection-not-loaded	2015-08-11 12:34:31 +02:00
SkipLists	move shaper to cxx	2015-07-28 17:38:31 +02:00
Utils	no explicit make_pair	2015-08-05 22:58:31 +02:00
V8Server	added configuration option `--database.throw-collection-not-loaded-error`	2015-08-11 12:31:42 +02:00
VocBase	added configuration option `--database.throw-collection-not-loaded-error`	2015-08-11 12:31:42 +02:00
Wal	remove useless reserve	2015-08-06 13:16:56 +02:00
CMakeLists.txt	move shaper to cxx	2015-07-28 17:38:31 +02:00
Makefile.files	move shaper to cxx	2015-07-28 17:38:31 +02:00