a-brandt
|
c2d0749178
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
arangod/RestHandler/RestDocumentHandler.cpp
arangod/RestHandler/RestEdgeHandler.cpp
arangod/RestHandler/RestImportHandler.cpp
arangod/V8Server/v8-vocbase.cpp
arangod/VocBase/document-collection.c
arangod/VocBase/document-collection.h
arangod/VocBase/primary-collection.c
arangod/VocBase/primary-collection.h
|
2012-10-24 10:46:38 +02:00 |
a-brandt
|
9a599e468a
|
added "_key" attribute
|
2012-10-23 15:58:09 +02:00 |
Jan Steemann
|
412dc52109
|
fixed memory zone issues
|
2012-10-14 21:35:41 +02:00 |
Jan Steemann
|
e51656767e
|
possible implementation for issue #213
|
2012-10-04 15:04:20 +02:00 |
Jan Steemann
|
43b14d0254
|
fixed compile warnings when compiled with --disable-logger
|
2012-09-28 14:29:32 +02:00 |
Jan Steemann
|
68b3d7e4f9
|
some multipart fixes
|
2012-09-24 17:35:07 +02: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
|
a932d335cb
|
added guards for collection locking and read/write transactions
|
2012-09-13 17:40:38 +02:00 |
Jan Steemann
|
72d2798368
|
improved error message for imports
|
2012-08-31 13:29:51 +02:00 |
Jan Steemann
|
ed395ab8ce
|
issue #153
|
2012-08-28 13:06:04 +02:00 |
Jan Steemann
|
0c822a8da1
|
issue #156: fixed memleaks in /_api/import
|
2012-08-15 14:24:59 +02:00 |
Jan Steemann
|
d320eaae97
|
unified error messages for /_api/import
|
2012-08-15 10:44:51 +02:00 |
Jan Steemann
|
384384932e
|
issue #59: added tests for /_api/import
|
2012-08-15 10:31:25 +02:00 |
Frank Celler
|
fb4a7618e4
|
the great Scheduler & Dispatcher refactoring
|
2012-06-30 23:52:49 +02:00 |
Jan Steemann
|
5a74e95f35
|
allow reusing ids and revision when creating collections and documents
|
2012-06-19 15:50:52 +02:00 |
Frank Celler
|
704f921d0f
|
new HttpRequest
|
2012-06-14 15:03:17 +02:00 |
Frank Celler
|
54826adb83
|
cleanup HttpRequest as prep for ZeroMQ
|
2012-06-13 21:51:27 +02:00 |
Frank Celler
|
d2c758d663
|
the great rename
|
2012-06-08 15:01:25 +02:00 |