Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
22,717 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

2850 Commits

Author SHA1 Message Date
Jan Steemann 6d7ccd7699 move shaper to cxx 2015-07-28 17:38:31 +02:00
Michael Hackstein 412394ff3c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-07-28 13:22:01 +02:00
Michael Hackstein 25f7b25206 Fixed failing failure-tests 2015-07-28 13:21:54 +02:00
Jan Steemann bef83a7fbb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-07-28 11:45:11 +02:00
Jan Steemann cdfdec9244 save some overhead when walking plans 2015-07-28 11:44:34 +02:00
Jan Steemann 3d3024a54e cppcheck 2015-07-28 09:51:24 +02:00
Jan Steemann 7f24ca0a21 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-07-27 16:25:13 +02:00
Jan Steemann 7e4b615248 simplify call to mmap 2015-07-27 16:24:25 +02:00
Frank Celler dc82cf3a65 delete jobs after deleting all threads 2015-07-27 13:08:56 +02:00
Max Neunhoeffer c4e8e4aea6 Improve sleeping times for dispatcher threads. 2015-07-24 14:37:17 +00:00
Jan Steemann 38b2d6caea Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-07-24 13:21:49 +02:00
Jan Steemann 4ae6b54183 fixed compiler warning 2015-07-24 13:20:08 +02:00
Frank Celler f96ab73745 Merge branch 'dispatcher' of github.com:arangodb/arangodb into devel 2015-07-24 11:32:22 +02:00
Frank Celler 33d702c190 ignore died process on delete 2015-07-24 09:30:26 +00:00
Frank Celler 8052ccf4c4 small grace 2015-07-24 09:23:34 +00:00
Frank Celler e7324b09fd better dispatcher wait 2015-07-24 08:53:37 +00:00
Michael Hackstein 9cc0554346 Merge branch 'fasterNeighbors' into devel 2015-07-24 10:25:00 +02:00
Michael Hackstein 4997491dea Memleak fixes provided by @jsteemann 2015-07-24 10:22:57 +02:00
Frank Celler 647ce78293 removed unused variable 2015-07-23 22:44:52 +02:00
Frank Celler 4d04f29575 added safe guard for too many threads 2015-07-23 18:09:30 +02:00
Frank Celler 23e1cd53fc fixed shutdown 2015-07-23 17:50:09 +02:00
Max Neunhoeffer 91673241b6 No lock for signal. Better startup of new threads. 2015-07-23 14:44:24 +00:00
Max Neunhoeffer d95d4edbca Fix bug with numeric queue ids. 2015-07-23 14:43:33 +00:00
Frank Celler 4dccc6a8dc Merge branch 'devel' of github.com:arangodb/arangodb into dispatcher 2015-07-23 15:41:05 +02:00
Frank Celler 35a3c6421c moved dispatcher to atomic 2015-07-23 15:40:34 +02:00
Max Neunhoeffer 68a5f3a131 Add one more comment. 2015-07-23 14:46:25 +02:00
Max Neunhoeffer 395e920825 Add a few more comments. 2015-07-23 14:44:58 +02:00
Max Neunhoeffer b76526e4f0 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-07-23 14:23:24 +02:00
Max Neunhoeffer 350da2c910 Add a data guardian implementation (lock-free using hazard pointers). 2015-07-23 14:23:04 +02:00
Jan Steemann 8ba04250d9 fix compiler warnings 2015-07-23 10:27:09 +02:00
Jan Steemann d6e7655c53 Windows 2015-07-22 14:52:16 +02:00
Max Neunhoeffer c3c1c3242f Add TRI_DEFER. 2015-07-22 10:29:13 +02:00
Jan Steemann dd03c03216 honor --server.disable-statistics for statistics aggregator thread 2015-07-21 19:20:37 +02:00
Jan Steemann abf69329e2 casts for Windows 2015-07-21 18:57:56 +02:00
Jan Steemann 38cdc662ec removed configure options `--enable-timing` and `--enable-figures` 2015-07-21 18:47:43 +02:00
Jan Steemann 20c96b5e46 removed locks 2015-07-21 17:34:57 +02:00
Jan Steemann 97094b8f74 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-07-21 14:08:22 +02:00
Jan Steemann 123a76089f removed JobType, special jobs and monopolizer 2015-07-21 14:07:53 +02:00
Frank Celler 556a393862 added separate statistics thread 2015-07-21 13:19:52 +02:00
Jan Steemann 09736f965f more lock instrumentation 2015-07-21 13:09:02 +02:00
Jan Steemann 4ff93e8bdc slight cleanup 2015-07-20 19:10:30 +02:00
Jan Steemann d33e95d452 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-07-20 18:42:14 +02:00
Jan Steemann 4d0872f2b9 more cxx 2015-07-20 18:42:02 +02:00
Frank Celler 9b95e08765 cleanup of member names 2015-07-20 17:40:13 +02:00
Jan Steemann 124fe7a34c use new/delete for TRI_vocbase_t 2015-07-20 12:08:13 +02:00
Jan Steemann a5db59cc47 remove some locks in HttpServer and friends 2015-07-17 17:48:45 +02:00
Jan Steemann dd8a392294 fix undefinedness 2015-07-17 13:56:41 +02:00
Jan Steemann c54b5a6ba8 renamed file 2015-07-16 21:06:29 +02:00
Jan Steemann efb68a2e6c added boost::lockfree and removed mutex in statistics 2015-07-16 20:24:58 +02:00
Jan Steemann a51765b3cf directly exit in case read buffer only contains a few bytes 2015-07-16 20:20:20 +02:00
Jan Steemann 7635d77a35 change default interval for scheduler-reporter 2015-07-16 17:34:36 +02:00
Jan Steemann 4bc188422a cppcheck 2015-07-15 22:13:42 +02:00
Jan Steemann 1428af9e49 remove useless header inclusions 2015-07-15 21:47:50 +02:00
Jan Steemann 21c4e919f5 remove lock in SchedulerLibev 2015-07-15 21:47:29 +02:00
Jan Steemann c30354f067 use scoped locks for SchedulerThread locking 2015-07-15 21:33:18 +02:00
Jan Steemann 84e6c29413 use scoped locks for HttpServer locking 2015-07-15 21:30:16 +02:00
Jan Steemann 74d1073875 small simplifications 2015-07-15 21:25:33 +02:00
Jan Steemann 60069e5713 lock only in case of non-nullptr 2015-07-15 21:22:36 +02:00
Jan Steemann 6d4dbcbb47 add SpinLock and SpinLocker, unified other Lockers 2015-07-15 21:22:00 +02:00
Willi Goesgens 0f85dec259 Fix memleak with unique_ptr 2015-07-15 09:57:35 +02:00
Jan Steemann 086663cbd3 rethrow exception 2015-07-14 18:30:42 +02:00
Jan Steemann 72feca418b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-07-14 18:23:42 +02:00
Jan Steemann f5a7e2120f pass filename to internal.parse() call 2015-07-14 18:23:08 +02:00
Willi Goesgens a435a96ea6 log exceptions during execution of scripts. 2015-07-14 17:36:30 +02:00
Willi Goesgens a2b29d8864 work around error message about empty object when compiling in devel mode. 2015-07-14 17:04:11 +02:00
Willi Goesgens f9cbb40a67 Add log output if executing javascript fails 2015-07-14 16:57:54 +02:00
Alan Plum c9e193e2b8 genRandomSalt should take an argument. 2015-07-14 16:43:07 +02:00
Jan Steemann af9c155c90 use references 2015-07-14 14:05:18 +02:00
Jan Steemann 2983f4e987 small garbage collection improvements 2015-07-14 13:30:37 +02:00
Jan Steemann cc27e9b88f try to pacify some compilers 2015-07-14 08:50:29 +02:00
Jan Steemann 7fcb007237 simplifications 2015-07-13 22:57:32 +02:00
Jan Steemann 53400a44a7 simplifications 2015-07-13 22:56:41 +02:00
Michael Hackstein 32100ca6fd Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-07-13 14:50:03 +02:00
Michael Hackstein b54dae0d5b Fixed a memleak in newest shortest path shortcut implementation 2015-07-13 14:49:54 +02:00
Frank Celler f5c1ca0a77 added missing iostream include 2015-07-13 11:29:05 +00:00
Jan Steemann 14ccfbabc3 Merge branch 'aql-query-cache' of https://github.com/arangodb/arangodb into devel 2015-07-13 12:46:41 +02:00
Jan Steemann 5a453bbcfc issue #1409: Document values with null character truncated with 2.6.2 on Windows 2015-07-13 12:45:13 +02:00
Michael Hackstein df33ffe410 Added an implementation for shortest path which allows to take shortcuts iff we do not have to access the data, f.e. filtering or distances. Gives an enormous speedup. 2015-07-13 11:31:42 +02:00
Jan Steemann c71dc4d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-query-cache 2015-07-13 10:49:14 +02:00
Willi Goesgens bd7aa7c305 Remove the global include to iostream; this reduces the compile time by 10% 
( http://herbsutter.com/2013/08/19/gotw-7a-solution-minimizing-compile-time-dependencies-part-1/  for inspiration)
 2015-07-07 12:11:21 +02:00
Max Neunhoeffer c87575ce33 Fix bug in AssocMulti lookupByKeyContinue if batchSize==1. 2015-06-29 16:32:00 +02:00
Jan Steemann 61e09fe10c mini optimization 2015-06-27 06:51:11 +02:00
Jan Steemann 8372c33993 fixed invalidation with index creation etc., adjusted tests 2015-06-25 23:40:31 +02:00
Willi Goesgens 641b6798a0 Fix grammer in docu 2015-06-24 17:42:39 +02:00
Jan Steemann f7d5a612d9 do not use EscapableHandleScope for TRI_json_t to V8 conversions 
Using EscapableHandleScope is slower than using a HandleScope directly
and also burst earlier with out of memory
 2015-06-19 15:06:33 +02:00
Jan Steemann 58a8f2a6a2 remove v8 dependency for arangoimp 2015-06-18 18:30:45 +02:00
Max Neunhoeffer 57716566c2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-06-18 17:30:08 +02:00
Max Neunhoeffer e3623cf6a5 Improve diagnostic output when dispatcher is reporting. 2015-06-18 17:29:36 +02:00
Jan Steemann 5e7dd0da7f Merge branch 'aql-argv-optimization' of https://github.com/arangodb/arangodb into devel 2015-06-18 17:12:14 +02:00
Jan Steemann a00288dc02 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-06-18 15:35:28 +02:00
Jan Steemann 83b326cfc7 moved PUT /_api/simple/all to C++ 2015-06-18 15:34:45 +02:00
Willi Goesgens 9c7d49a666 Merge branch 'v8_4.2' of github.com:arangodb/arangodb into devel 2015-06-18 10:34:08 +02:00
Jan Steemann 788f99980a Merge branch 'aql-parser-simplification' of https://github.com/arangodb/arangodb into devel 2015-06-17 15:15:40 +02:00
Jan Steemann 2a8192105a Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-argv-optimization 2015-06-17 12:41:38 +02:00
Jan Steemann 30ef155b16 issue #1313: escape whitespace in process name when scanning /proc/pid/stats 
This fixes statistics values read from that file
 2015-06-17 11:54:59 +02:00
Jan Steemann dec79dd051 pass function arguments by reference 2015-06-16 18:01:45 +02:00
Jan Steemann 7cd27d5c56 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-parser-simplification 2015-06-16 15:14:18 +02:00
Michael Hackstein 933e4c353a Added further OOM tests for ShortestPath computation 2015-06-16 11:27:21 +02:00
Jan Steemann 5cac2938b1 exception handling 2015-06-16 09:37:02 +02:00
Jan Steemann e7ff3f2a19 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-parser-simplification 2015-06-12 12:04:41 +02:00
Jan Steemann 1a18fb0282 factor out huge array/object literals when calling V8-based AQL functions 2015-06-12 11:50:22 +02:00
Jan Steemann ff7a00d6e4 fixed edge index selectivity estimates and added tests 2015-06-11 21:22:01 +02:00
Jan Steemann 89cdcc6837 emulate 2.5ish logging order for request logging 
this ensures that request logging is also sent to the syslog
 2015-06-11 13:14:31 +02:00
Max Neunhoeffer 8ae33e04e7 Fix selectivity estimate by casting to double before division. 2015-06-11 11:50:51 +02:00
Jan Steemann 79ce6eb93b fixed threading issues 2015-06-11 09:50:56 +02:00
Jan Steemann d99d164c0a simplified parser 2015-06-10 20:25:25 +02:00
Jan Steemann f5f719360c added out-of-bounds checking for _heap and _history 2015-06-10 18:04:17 +02:00
Jan Steemann 3d4f323718 fix some issues with multiple databases and database-switching 2015-06-10 13:24:38 +02:00
Jan Steemann b5896be10b simplifications 2015-06-10 11:53:31 +02:00
Jan Steemann a6b2998b5d added try...catch blocks for V8-to-CPP bindings 2015-06-08 16:04:42 +02:00
Jan Steemann 2178ace348 fixed invalid usage of null 2015-06-03 09:25:35 +02:00
Jan Steemann 4c7994597a cppcheck 2015-06-02 22:49:22 +02:00
Jan Steemann b44ae7b471 make Json smaller 2015-06-02 14:11:20 +02:00
Jan Steemann 39cf9c527c micro optimizations 2015-06-01 14:56:01 +02:00
Jan Steemann 2d2bf87a2d printers for standard objects 2015-05-29 17:49:19 +02:00
Willi Goesgens 1d6765b603 Add TryCatch to JS_Load, since V8 doesn't like to continue here without that. 2015-05-29 16:51:47 +02:00
Jan Steemann a64ac35168 updated documentation 2015-05-29 11:47:14 +02:00
Jan Steemann 6d5b86867d added print methods 2015-05-29 11:45:01 +02:00
Jan Steemann db617fd514 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-05-29 09:49:31 +02:00
Jan Steemann 88198767dd logging 2015-05-29 09:49:22 +02:00
Willi Goesgens e1255b4e65 Fix signature of windows function dummy. 2015-05-29 09:28:27 +02:00
Michael Hackstein 6a7dae216d Merge branch 'devel' of github.com:/arangodb/arangodb into devel 2015-05-28 15:18:32 -07:00
Max Neunhoeffer 33dec8806b added 3=scheduler, 4=dispatcher 2015-05-28 13:48:02 +00:00
Frank Celler c2db22e379 linux processor affinity 2015-05-28 14:51:32 +02:00
Frank Celler f5f8afea22 added empty affinity implementation 2015-05-28 13:51:34 +02:00
Jan Steemann ad59242822 fixed ambiguous attribute name "version" for collections 2015-05-28 11:54:57 +02:00
Jan Steemann 4dde6e49cd goodbye barriers, welcome ditches 2015-05-28 10:23:30 +02:00
Michael Hackstein 6eadcb31ff Fixed a bug where the shortest path computation computed the correct distancebut returned a wrong path. It was only triggered under very special conditions 2015-05-27 13:42:21 -07:00
Jan Steemann 03461903fe fixed over-eager V8 context entering and exiting in non-cluster mode 2015-05-27 14:02:13 +02:00
Jan Steemann 07e553cd8d Merge branch 'devel' of https://github.com/arangodb/arangodb into index-cxx 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2015-05-26 17:07:26 +02:00
Willi Goesgens 53a37ae387 Fix timeouts - followup of #cc427f9b1c0e28fec5abc312df606229195db7b8 
- use TRI_microtime() instead of copying it with the name 'now()'
  - handle select-timeouts on non linux platforms.
 2015-05-26 15:55:36 +02:00
Max Kellermann c9075aeacf lib/SimpleHttpClient: don't reset timeout after EINTR 
select() modifies the given timeout variable.  Calling select() again
will run with the remaining timeout.  However, method prepare()
overwrote the reduced timeout in each iteration.
 2015-05-26 15:03:11 +02:00
Jan Steemann a9f2769ffa now compiles and links 2015-05-23 04:31:13 +02:00
Willi Goesgens fe19440bca Add documentation for some more filesystem calls; change sequence. 2015-05-22 16:34:27 +02:00
Willi Goesgens 871a95122c Work on documentation - not all documentation from the code seems to appear in the generated documentation. 2015-05-22 15:37:23 +02:00
Willi Goesgens c418f10729 Implement copying of files, since copyRecursive can't copy single files. 2015-05-21 15:49:10 +02:00
Jan Steemann 5a4eb1719f added missing declarations 2015-05-21 09:56:48 +02:00
Jan Steemann 882f233fd8 constify 2015-05-21 09:56:37 +02:00
Jan Steemann d4285fc6fd fix Visual Studio compile warnings 2015-05-20 16:12:30 +02:00
Jan Steemann 688b21fe51 fixed namespaces 2015-05-20 15:49:39 +02:00
Willi Goesgens 8e858bc96d Upgrade V8 to 4.2.77 
- v8 now requires llvm libstdc++ inline
  - ForceDelete is gone now; employ new tactics of working with wrapping shaped json
  - gold crashes while linking V8, remove it.
 2015-05-20 15:10:28 +02:00
Michael Hackstein 86c7f87dd3 Merge branch 'cppTrav2' into devel 2015-05-19 16:17:27 -07:00
Jan Steemann 77650c602b fixed wrong define 2015-05-19 15:58:38 +02:00
Willi Goesgens 05cb5c1ee2 fix typo. 2015-05-19 10:51:28 +02:00
Max Neunhoeffer 0c6f5263d2 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-05-18 13:57:56 -07:00
Max Neunhoeffer e426ca9205 Fix bug in edge index. 2015-05-18 13:57:32 -07:00
Jan Steemann 82199b1d71 fixed format string for reading /proc/pid/stat 2015-05-18 12:17:32 +02:00
Jan Steemann 8670f2a36d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-05-18 10:33:53 +02:00
Jan Steemann 30a9f44e64 please the VisualStudio compiler 2015-05-18 10:33:37 +02:00
Jan Steemann 96648678aa prevent memleak, disable debug output 2015-05-18 10:32:11 +02:00
Max Neunhoeffer 13204298d9 Make number of buckets in edge index configurable. 2015-05-17 19:04:47 -07:00
Max Neunhoeffer ead85dfd7c Use multiple buckets in AssocMulti hash. 2015-05-17 11:32:58 -07:00
Max Neunhoeffer fe7eb0d1ad Use high water mark 66% and low water mark 33% in edge index. 2015-05-16 13:58:44 -07:00
Max Neunhoeffer a2f9eee8fc Add performance logging to edge index resizing. 2015-05-16 10:02:41 -07:00
Max Neunhoeffer eef79e68eb Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-05-15 17:19:46 -07:00
Max Neunhoeffer 78bf0d2de3 Improve performance of edge index resize. 2015-05-15 17:16:14 -07:00
Max Neunhoeffer ca17b07dca C++-ify associative-multi and add hashCache, adapt edge index. 2015-05-15 16:37:56 -07:00
Jan Steemann b6142f475c micro optimizations 2015-05-15 17:40:41 +02:00
Jan Steemann 91bf984de7 update docs for `--log.performance` 2015-05-13 21:21:08 +02:00
Jan Steemann c19352e4af adjusted timer output 2015-05-13 12:58:20 +02:00
Jan Steemann f8a4df2ad4 Merge branch 'edge-index-resize' of https://github.com/arangodb/arangodb into devel 
Conflicts:
	lib/Basics/associative-multi.cpp
 2015-05-13 12:52:38 +02:00
Willi Goesgens 421d9fbb9e Add performance logging for index building. 2015-05-13 10:49:38 +02:00
Willi Goesgens 470c0401c1 Add filename to the exception 2015-05-13 10:49:15 +02:00
Jan Steemann ceecbf372f slight API change 2015-05-13 09:06:35 +02:00
Jan Steemann 8480c8b000 speed up resizing of edge index 2015-05-12 21:03:30 +02:00
Jan Steemann 2afb15165a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-05-12 13:36:19 +02:00
Jan Steemann 2e75255ea6 added `--log.performance` startup option, removed `--log.severity` option 2015-05-12 12:48:13 +02:00
Jan Steemann 3979bde40e release locks before debug message printing 2015-05-11 22:59:34 +02:00
Jan Steemann 488c46f0ad slightly less string creation 2015-05-11 22:59:09 +02:00
Jan Steemann 40eaea7154 removed virtual declarations 2015-05-11 22:58:45 +02:00
Jan Steemann 6e7332afce removed unused methods 2015-05-11 22:58:08 +02:00
Jan Steemann 5cd7b64ce8 fixed potential race during arangob runs 2015-05-11 22:57:30 +02:00
Jan Steemann 214d529d36 use unordered containers 2015-05-11 22:55:41 +02:00
Jan Steemann 5e4cdc548c added override final 2015-05-11 22:54:55 +02:00
Jan Steemann 771f2db94b cleanup 2015-05-11 17:26:42 +02:00
Jan Steemann bb3f208a9b use block scope 2015-05-08 18:02:45 +02:00
Jan Steemann cb38a5459e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-05-08 17:45:16 +02:00
Jan Steemann dd51747a3d fix issue in regex 2015-05-08 17:45:00 +02:00
Jan Steemann 5ad7dea0c8 use auto for HTTP response headers iteration 2015-05-08 17:44:33 +02:00
Jan Steemann 6e08289511 added <array> 2015-05-08 17:32:30 +02:00
Frank Celler 154b94c105 added internal support for SID 2015-05-07 15:54:57 +02:00
Jan Steemann e230b5a373 privatize vector->_memoryZone, too 2015-05-07 14:13:55 +02:00
Jan Steemann 6b412a1c01 Merge branch 'json-privatisierung' of https://github.com/arangodb/arangodb into json-privatisierung 2015-05-07 13:05:12 +02:00
Jan Steemann 537b115eac optimized json parsing for V8 clients 2015-05-07 12:36:50 +02:00
Willi Goesgens dd583fdf0f Nullptr & unneccesary casts 2015-05-06 18:06:59 +02:00
Jan Steemann 4ea2a53771 support arrays in fulltext index, too 2015-05-06 15:11:24 +02:00
Jan Steemann 42a3321e1c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-05-06 14:21:44 +02:00
Jan Steemann 0996d603c6 fulltext improvements 2015-05-06 14:21:32 +02:00
Willi Goesgens 3c4e73cd01 * fix memleak if adding async jobs to queues fails 
* nullptr
 2015-05-06 12:22:36 +02:00
Jan Steemann e93225d7f5 fix cluster document fetching 2015-05-06 11:00:41 +02:00
Jan Steemann 0254bb50f4 fixed variable usage 2015-05-06 09:46:17 +02:00
Jan Steemann a007a867ee "privatized" TRI_vector_t internals. 
This allows changing the internals of TRI_vector_t structs in order to make the struct smaller.
On 64 bits, the size of TRI_vector_t is reduced from 48 bytes to 28 bytes.
TRI_json_t does benefit from this, as its biggest component is a TRI_vector_t.
 2015-05-05 10:31:02 +02:00
Jan Steemann f09d8903a9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
Conflicts:
	Documentation/Scripts/generateExamples.py
 2015-05-04 17:47:31 +02:00
Jan Steemann 244cc2d66d added some batch processing methods 2015-05-04 17:46:47 +02:00
Willi Goesgens 9018757846 If an HTTP-Requests fails, put the error message into the status object, so we can see more reasons in cluster errors. 2015-05-04 17:20:39 +02:00
Alan Plum 4f17dfe10e Added error 1237: collection type mismatch. 2015-05-03 22:55:56 +02:00
Michael Hackstein ca0de62aa3 Moved all v8 context sensitive parts into from V8Traverser v8-vocbase 2015-05-02 21:46:54 -07:00
Max Neunhoeffer 8b8f81c25d Fix a nullptr dereferencing bug. 2015-05-02 07:03:32 +02:00
Max Neunhoeffer 97f7743d84 Less copying in Traverser. 2015-05-02 06:28:52 +02:00
Michael Hackstein 2ba5ee47df Made everything compile again 2015-05-01 17:21:15 -07:00