1
0
Fork 0
arangodb/arangod/VocBase
Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh
Conflicts:
	lib/ShapedJson/Legends.cpp
	lib/ShapedJson/Legends.h
2014-05-20 17:03:49 +02:00
..
FILES.md updated docs 2013-09-26 09:57:02 +02:00
LOCKS.md updated docs 2013-09-26 09:57:02 +02:00
auth.cpp fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
auth.h added changePassword attribute for users 2014-03-25 11:40:13 +01:00
barrier.cpp fixed bug in too eager datafile removal 2014-05-14 12:28:29 +02:00
barrier.h fixed bug in too eager datafile removal 2014-05-14 12:28:29 +02:00
cleanup.cpp fixed bug in too eager datafile removal 2014-05-14 12:28:29 +02:00
cleanup.h updated disclaimer 2013-03-13 17:03:18 +01:00
collection.cpp fixed VS warnings 2014-05-13 13:39:42 +02:00
collection.h cpp 2014-04-03 17:50:38 +02:00
compactor.cpp cppcheck 2014-05-09 00:21:17 +02:00
compactor.h don't wait long in compactor if compaction lock cannot be acquired instantly 2013-11-13 21:01:43 +01:00
datafile.cpp fixed VS warnings 2014-05-13 13:39:42 +02:00
datafile.h Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:32:02 +02:00
document-collection.cpp adding edges 2014-05-20 16:58:05 +02:00
document-collection.h properly acquire shape write locks 2014-02-28 18:43:09 +01:00
edge-collection.cpp cppcheck 2014-05-09 00:21:17 +02:00
edge-collection.h removed unused defines 2014-05-20 16:16:22 +02:00
general-cursor.cpp cpp 2014-04-03 17:50:38 +02:00
general-cursor.h changed reference counting for cursors 2013-09-16 13:51:33 +02:00
headers.cpp cpp 2014-04-03 17:50:38 +02:00
headers.h more assertions 2013-06-24 14:25:21 +02:00
index.cpp First working version of arangorestore for clusters. 2014-05-09 16:33:54 +02:00
index.h First working version of arangorestore for clusters. 2014-05-09 16:33:54 +02:00
key-generator.cpp generate/validate keys 2014-04-11 16:19:00 +02:00
key-generator.h generate/validate keys 2014-04-11 16:19:00 +02:00
marker.cpp cpp 2014-04-03 17:50:38 +02:00
marker.h cpp 2014-04-03 17:50:38 +02:00
primary-collection.cpp added index memory usage statistics 2014-05-02 22:05:29 +02:00
primary-collection.h adding edges 2014-05-20 16:58:05 +02:00
replication-applier.cpp fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
replication-applier.h added --server.ssl-protocol option for client tools 2013-12-13 17:58:24 +01:00
replication-common.cpp cpp 2014-04-03 23:22:32 +02:00
replication-common.h simplified build.h stuff 2013-08-28 19:57:07 +02:00
replication-dump.cpp cpp 2014-04-03 23:22:32 +02:00
replication-dump.h added collection id translation for dumps 2013-10-09 13:46:12 +02:00
replication-logger.cpp fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
replication-logger.h replication applier will now preferrably use collection names instead of collection ids when applying events 2013-10-14 13:45:44 +02:00
replication-master.cpp cpp 2014-04-03 23:22:32 +02:00
replication-master.h refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
server.cpp cppcheck 2014-05-09 00:21:17 +02:00
server.h changed authentication procedure 2014-03-06 16:37:00 +01:00
synchroniser.cpp cpp 2014-04-03 23:22:32 +02:00
synchroniser.h transactions 2013-04-11 19:06:55 +02:00
transaction.cpp added save() method, still broken 2014-05-20 11:31:42 +02:00
transaction.h added save() method, still broken 2014-05-20 11:31:42 +02:00
update-policy.cpp cpp 2014-04-03 17:50:38 +02:00
update-policy.h simplified writing of markers into datafiles 2013-03-18 20:04:31 +01:00
voc-shaper.cpp explicitly name test cases 2014-05-16 18:38:53 +02:00
voc-shaper.h moved magic number to function 2014-05-16 19:05:54 +02:00
voc-types.h refactoring of multiple databases, intermediate commit 2013-09-11 11:42:34 +02:00
vocbase-defaults.cpp cpp 2014-04-03 17:50:38 +02:00
vocbase-defaults.h removed command line option `--database.remove-on-drop` 2014-03-10 17:03:17 +01:00
vocbase.cpp cppcheck 2014-05-09 00:21:17 +02:00
vocbase.h cpp 2014-04-03 23:22:32 +02:00