12 Commits

Author	SHA1	Message	Date
Michael Hackstein	0985e7fc88	Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types	2016-08-26 12:52:41 +02:00
jsteemann	900c28aec9	moved _compactionLock out of TRI_collection_t	2016-08-26 11:53:42 +02:00
jsteemann	bcd3e927a9	Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream	2016-08-26 09:18:58 +02:00
jsteemann	6150da7420	remove function pointers from TRI_datafile_t, added constructor and destructor	2016-08-26 09:08:24 +02:00
Michael Hackstein	e75567dae5	Further fixes for tests: Fixed unitialized count. Fixed some false CORRUPTED_COLLECTION states.	2016-08-26 08:02:34 +02:00
Michael Hackstein	7d6402b15c	Fixed soem crashes and undefined behaviuor. Server does not crash during tests, however a lot of them are still red	2016-08-25 14:51:03 +02:00
Michael Hackstein	e1ac5175b1	Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types	2016-08-25 11:09:11 +02:00
Michael Hackstein	1f3dabc8e1	Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types	2016-08-25 11:08:39 +02:00
jsteemann	a71ed2a09d	privatize methods	2016-08-25 10:07:23 +02:00
jsteemann	2e48293c52	privatize methods	2016-08-25 09:56:00 +02:00
jsteemann	7794b76b33	intermediate commit	2016-08-24 10:54:47 +02:00
jsteemann	9f424553ca	stub implementation for engine-specific collections	2016-08-19 15:19:23 +02:00