20 Commits

Author	SHA1	Message	Date
jsteemann	1a4a95a2ad	notify queries about shutdown	2016-05-06 10:20:00 +02:00
jsteemann	4a7c9f0f68	simplified bloated comments	2016-04-09 11:27:30 +02:00
Max Neunhoeffer	238937128a	Merge branch 'devel' into ClustUp2	2016-01-29 13:59:11 +01:00
Jan Steemann	9046e1831b	clang-format	2016-01-27 13:43:46 +01:00
Max Neunhoeffer	887e571a26	Merge branch 'devel' into ClustUp2	2016-01-26 18:01:42 +01:00
jsteemann	431900f17a	changed namespace from triagens to arangodb	2016-01-17 00:44:53 +01:00
Max Neunhoeffer	b0283077db	Merge branch 'devel' into ClustUp2	2016-01-11 11:41:36 +01:00
Max Neunhoeffer	dd364a9d20	Fix merge.	2016-01-11 11:38:10 +01:00
Max Neunhoeffer	e7eae3a73a	Merge branch 'devel' into ClustUp2	2016-01-11 11:01:45 +01:00
Jan Steemann	687d6133f0	comments reformatting	2016-01-11 09:52:39 +01:00
Jan Steemann	3ad20c0cae	auto-generated headers	2016-01-06 18:41:51 +01:00
Jan Steemann	a3b026d9d1	removed useless sections from code, unified include guards	2016-01-06 14:15:22 +01:00
Jan Steemann	f422576ee0	clang-format	2016-01-05 17:43:24 +01:00
Max Neunhoeffer	fa17c1ac22	Add reporting about query state. Needed for synchronous replication.	2015-12-30 16:52:47 +01:00
Jan Steemann	9ef5b4746a	removed several includes from Common.h	2015-11-25 12:21:55 +01:00
Jan Steemann	124fe7a34c	use new/delete for TRI_vocbase_t	2015-07-20 12:08:13 +02:00
Jan Steemann	d91cc3e9b3	added more tests	2015-03-14 20:49:22 +01:00
Jan Steemann	70ce59abb6	log when killing a query	2015-03-12 15:10:33 +01:00
Jan Steemann	f035ea1c3b	kill AQL queries ... Conflicts: arangod/Aql/ExecutionBlock.cpp	2015-03-12 15:00:14 +01:00
Jan Steemann	64d77cbe24	added query tracking feature	2015-03-12 13:02:13 +01:00