16 Commits

Author	SHA1	Message	Date
Frank Celler	891cac01b2	Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel ... Conflicts: arangod/VocBase/collection.c	2013-03-13 17:05:59 +01:00
Frank Celler	1aa5109fa3	updated disclaimer	2013-03-13 17:03:18 +01:00
Jan Steemann	836963ae00	less compaction	2013-03-12 18:17:27 +01:00
Jan Steemann	2a6180b5fe	fixes	2013-03-06 17:10:52 +01:00
Jan Steemann	5098792b4f	fixed invalid pointers when compacting deletion markers ... fixed invalid pointers for updates	2013-03-06 14:02:32 +01:00
Oreste Panaia	fc5e1ba623	merge conflicts with devel	2013-02-28 19:42:58 +08:00
Oreste Panaia	a48696ec28	network modifications required for windows	2013-02-28 17:43:39 +08:00
Frank Celler	069dcdfc94	changed logging of fatal errors	2013-02-14 16:47:35 +01:00
Frank Celler	503e0ff8fe	fixed merge conflicts	2013-01-02 18:07:57 +01:00
Jan Steemann	b5d0457f3a	fixed some issues reported by cppcheck	2012-12-12 18:42:11 +01:00
Jan Steemann	38809d4612	added callbacks for index cleanup	2012-12-06 15:46:11 +01:00
Oreste Panaia	857b66c490	windows version	2012-12-06 20:44:01 +08:00
a-brandt	71d3d54de1	collection info struct changed	2012-11-15 11:24:35 +01:00
Jan Steemann	1b1d7ba877	renamed simple_collection to document_collection	2012-09-14 14:46:37 +02:00
Jan Steemann	9bc99b7c9d	renamed document collection to primary collection	2012-09-14 10:19:41 +02:00
Jan Steemann	7626972890	issue #155	2012-09-06 17:48:06 +02:00