Jan Steemann c034307dca Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 ... Conflicts: arangod/Utils/CollectionNameResolver.h		2014-09-10 15:54:49 +02:00
..
AhuacatlGuard.h	updated disclaimer	2014-06-20 16:40:35 +02:00
AhuacatlTransaction.h	recovery and replication	2014-06-30 13:07:48 +02:00
AqlTransaction.h	renamed method	2014-09-09 10:40:57 +02:00
CollectionGuard.h	updated disclaimer	2014-06-20 16:40:35 +02:00
CollectionNameResolver.h	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-09-10 15:54:49 +02:00
CollectionReadLocker.h	updated disclaimer	2014-06-20 16:40:35 +02:00
CollectionWriteLocker.h	updated disclaimer	2014-06-20 16:40:35 +02:00
DatabaseGuard.h	updated disclaimer	2014-06-20 16:40:35 +02:00
DocumentHelper.cpp	Improve error handling in arangorestore.	2014-07-10 14:06:26 +02:00
DocumentHelper.h	nullptr	2014-06-21 03:27:38 +02:00
Exception.cpp	Exceptions: don't print Backtraces if the exception is handled in the subsequent js code.	2014-08-29 12:15:19 +02:00
Exception.h	Exceptions: don't print Backtraces if the exception is handled in the subsequent js code.	2014-08-29 12:15:19 +02:00
ExplicitTransaction.h	recovery and replication	2014-06-30 13:07:48 +02:00
ReplicationTransaction.h	recovery and replication	2014-06-30 13:07:48 +02:00
RestTransactionContext.h	updated disclaimer	2014-06-20 16:40:35 +02:00
SingleCollectionReadOnlyTransaction.h	simplification of signatures	2014-06-24 00:32:40 +02:00
SingleCollectionTransaction.h	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-28 11:06:14 +02:00
SingleCollectionWriteTransaction.h	implemented insert node	2014-08-15 18:12:33 +02:00
Transaction.cpp	updated disclaimer	2014-06-20 16:40:35 +02:00
Transaction.h	Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2	2014-08-28 11:06:14 +02:00
V8ResolverGuard.h	nullptr	2014-06-21 03:27:38 +02:00
V8TransactionContext.h	nullptr	2014-06-21 03:27:38 +02:00
transactions.h	added NTH function	2014-08-28 11:03:48 +02:00