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

952 Commits

Author SHA1 Message Date
jsteemann 952b9c00c2 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-03 10:43:56 +01:00
Frank Celler ca28e7c978 added support for topic logging 2017-02-02 16:00:37 +01:00
jsteemann 454c69a148 fix integer handling 2017-02-02 10:15:39 +01:00
Wilfried Goesgens bb80b5cf90 Merge branch 'devel' of github.com:arangodb/ArangoDB into v8_subsubmodule 2017-01-31 16:34:42 +01:00
Wilfried Goesgens 584f3120dd Upgrade V8 
- ICU now doesn't build the icudata library anymore
    - ship the icu database on all platforms and all packages
    - we now load the icu database file ourselves, and hand over the pointer to ICU.
  - follow the V8 changes around Weak pointer handling
 2017-01-30 12:30:07 +01:00
jsteemann f0d4770879 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-27 11:16:37 +01:00
Alan Plum 6bd388672e
Restore original TRI_StringifyV8Exception 
It's still being used outside the actual JS logic so we should probably leave it alone for now.
 2017-01-27 05:59:06 +01:00
Alan Plum c9b926916a
Even cleaner SyntaxError stacktraces 
Don't clutter stacktraces for Node compatibility at all. Just add lineNumber/columnNumber/fileName to the object.
These are non-standard but there is precedent for these names in Mozilla.
 2017-01-27 05:53:39 +01:00
Alan Plum 88ac5777d6
Clean up SyntaxError generation 
Clobber stacktrace instead of wrapping in another exception with wonky message string.
This makes SyntaxError details node-compatible and parseable for generating code frames.
 2017-01-27 05:34:22 +01:00
jsteemann 97ccfc9efc remove useless includes 2017-01-25 12:00:57 +01:00
Frank Celler f12c38dc0b added work context 2017-01-22 12:53:52 +01:00
Kaveh Vahedipour 2d21b62007 agency compaction leaves last compaction-keep-size indices behind for reference 2017-01-17 12:15:18 +01:00
jsteemann 9e7a98332d try to fix Windows compile errors 2017-01-03 13:21:04 +01:00
jsteemann c44a5c38a8 fix compile errors 2016-12-27 20:00:25 +01:00
jsteemann 97ddfc661c fix broken arguments address capturing 2016-12-27 18:22:31 +01:00
Alan Plum 61301a391b
Expose PKCS5_PBKDF2_HMAC to JS 2016-12-19 02:20:51 +01:00
jsteemann 7dddbbe00c cosmetics 2016-11-19 09:22:57 +01:00
Jan Steemann a46efabacf preparations for issue #1974 2016-11-17 14:42:18 +01:00
jsteemann da2aa24703 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-11-09 14:46:56 +01:00
jsteemann ab4933c994 performance optimizations 2016-11-09 14:46:50 +01:00
Jan Steemann 8504246217 changed behavior of toJSON() function when serializing an object before saving it in the database 
if an object provides a toJSON() function, this function is still called for serializing it.
the change is that the result of toJSON() is not stringified anymore, but saved as is. previous
versions of ArangoDB called toJSON() and after that additionally stringified its result.
 2016-11-08 15:39:06 +01:00
jsteemann b2c04f6165 work around unexcepted start/end values from V8 2016-11-03 17:02:53 +01:00
Andreas Streichardt 1318fa313b Implement cluster authentication 2016-10-17 13:35:55 +02:00
Frank Celler eed90fc588 fixed cppcheck warnings 2016-09-09 15:08:48 +02:00
jsteemann 37258adb57 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 16:37:25 +02:00
Kaveh Vahedipour e07543c2e2 Adding Foxx access to agency 2016-08-26 16:25:03 +02:00
jsteemann 4b53310189 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 13:42:40 +02:00
Kaveh Vahedipour b409a1ff25 Adding Foxx access to agenc 2016-08-26 13:35:39 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
jsteemann c5f151da5c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 11:01:15 +02:00
Kaveh Vahedipour d8cb8a33ac pushing corrected unittest script and cluster startup scripts 2016-08-19 09:49:44 +02:00
jsteemann 1ec14d0bba privatize attributes 2016-08-15 15:47:39 +02:00
jsteemann 0ceccf6370 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-05 16:23:30 +02:00
Jan Steemann 0de5561659 moved mostly unused functions 2016-08-05 16:14:39 +02:00
Jan Steemann e69e49f145 fix Buffer array access 2016-08-05 14:50:06 +02:00
jsteemann 1139505641 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-04 17:19:05 +02:00
jsteemann 752015ddb2 added functions V8_TO_VPACK and VPACK_TO_V8 2016-08-04 16:02:46 +02:00
jsteemann 71bd7deace Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-01 09:04:17 +02:00
Frank Celler 51683dbda0 added a panic interrupt of memory gets low 2016-07-31 12:58:27 +02:00
jsteemann a0f0055b6f moved all database management functions into DatabaseFeature 2016-07-25 15:48:37 +02:00
Max Neunhoeffer 2fcbf1e488 Fix a bug in the VPack->V8 conversion. 
Happened when a special attribute _key etc. did not contain a string
value, which is allowed below the top level of a document in a
collection.
 2016-07-08 23:57:05 +02:00
jsteemann a9c34259cf micro optimizations 2016-06-30 14:54:51 +02:00
Jan Steemann 2525816892 fixed function signature in error reporting 2016-06-22 14:30:33 +02:00
Jan Steemann 24ee67eda7 try to fix potential crashes 2016-06-14 16:41:00 +02:00
Frank Celler fdf375a01e isStopping 2016-06-10 11:12:01 +02:00
Max Neunhoeffer c6bf02a245 Honour isRestore option in <coll>.insert, <coll>.replace and <coll>.update. 2016-06-10 10:29:00 +02:00
Max Neunhoeffer 4ba6d8acbb Next iteration of performRequests improvement. 
asyncRequest has now two timeouts, one for the connection phase
leading to retries for failover situations, the other for the
completion of the whole operation.
 2016-06-07 14:12:09 +02:00
jsteemann 325aa13795 merge with velocypack 2016-06-06 16:59:36 +02:00
Andreas Streichardt 6cb00f905d Merge branch 'devel' into jwt 2016-05-30 18:49:26 +02:00
Andreas Streichardt 5b0055bfbf jwt generation works 2016-05-30 18:47:04 +02:00
jsteemann b8f99fa717 slightly adjusted wait times 2016-05-30 09:34:13 +02:00
jsteemann f196428920 updated CHANGELOG 2016-05-23 18:45:48 +02:00
Max Neunhoeffer a73b348e77 Add TRI_SuspendExternalProcess and TRI_ContinueExternalProcess for Unix. 2016-05-19 14:06:57 +02:00
jsteemann 61b24c5b47 optimizations 2016-05-11 22:16:15 +02:00
jsteemann 130493d481 micro optimizations 2016-05-11 21:02:20 +02:00
Frank Celler bf16086623 moved SSL files into separate directory 2016-05-11 16:34:03 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
jsteemann 96fceb4411 use std::unordered_maps for headers 2016-05-01 20:52:47 +02:00
jsteemann e137b37d1d cleanup 2016-05-01 14:13:20 +02:00
jsteemann cfc43ced78 optimized path for VPack to V8 conversion 2016-05-01 01:27:25 +02:00
jsteemann bfd6fa833d disallow thread creation until ApplicationServer::start() 2016-04-27 16:17:46 +02:00
jsteemann 5fb9d758c9 micro optimizations 2016-04-26 10:38:47 +02:00
Frank Celler d6e8046992 updated cleanupCFiles 2016-04-23 16:34:57 -07:00
jsteemann 28930370c2 micro optimizations 2016-04-23 20:49:22 +02:00
jsteemann 0da9ac7cdc micro optimizations 2016-04-23 16:23:15 +02:00
Jan Steemann 3df61226d6 properly initialized 2016-04-22 17:07:02 +02:00
Jan Steemann e3db1236c6 fixed compile warnings 2016-04-22 15:31:47 +02:00
Frank Celler 5335a5b0af moved to Random 2016-04-21 22:53:20 -07:00
Max Neunhoeffer d049b04cd7 Fix compilation. 2016-04-21 14:32:15 +02:00
Wilfried Goesgens 084bb330cb Add tiny wrapper around the ICU-string tokenizer, so one can easily try out what the fulltext index would do. 2016-04-21 14:18:17 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
jsteemann 3fbed92166 use Empty() object 2016-04-21 09:22:01 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Jan Steemann bc7d45aada fixed crash 2016-04-19 16:38:50 +02:00
Frank Celler d02063688b fixed url building 2016-04-17 17:44:18 -07:00
Frank Celler 614720c75a fixed url building 2016-04-17 17:43:49 -07:00
Frank Celler 17cd890132 WIP 2016-04-16 20:29:33 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Frank Celler 0fa6435731 WIP 2016-04-13 21:12:16 +02:00
Wilfried Goesgens d0692b90f0 fix typo 2016-04-12 15:12:36 +02:00
Frank Celler 3d2cc31306 WIP 2016-04-11 00:05:37 +02:00
Jan Steemann 9b844340a3 fix pid 2016-04-08 14:40:45 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Jan Steemann 99719c6957 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 17:02:15 +02:00
Wilfried Goesgens 8a0cc60266 i.e. github requires a useragent, thus enable it. 2016-04-07 14:51:01 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Andreas Streichardt 49a3d3e018 Cleaning up the ifs....Greatly simplifying testing.js 2016-04-04 19:26:30 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Frank Celler 66b2a3717d WIP 2016-04-03 00:25:36 +02:00
Frank Celler e83c1f09b4 WIP 2016-04-02 23:41:21 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Frank Celler af00417cf4 skeleton arangod 2016-03-25 15:14:43 +01:00
Jan Steemann c8c9288400 harmonize value comparisons for hash indexes 2016-03-23 16:36:00 +01:00
Frank Celler 86fe838a68 new logger 2016-03-22 21:09:48 +01:00
jsteemann 3dede4a71f cleanup 2016-03-21 22:30:00 +01:00
Jan Steemann b672ce0985 test fixes 2016-03-21 12:15:40 +01:00
Jan Steemann f17d17841f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-21 09:28:35 +01:00
jsteemann 4d3e00ff48 optimized v8-to-vpack conversion 2016-03-18 19:40:46 +01:00
jsteemann f12320277f bugfixes 2016-03-18 16:56:05 +01:00
jsteemann 2af9c58b1c fixed uninitialized _revkey value 2016-03-18 16:50:29 +01:00
jsteemann 60b145ceae removed unused persistents 2016-03-18 15:49:06 +01:00
jsteemann e0ce1cef5a make buffers somewhat usable 2016-03-17 22:47:22 +01:00
jsteemann 996299cea3 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-17 17:17:50 +01:00
jsteemann 4de93d49b9 added shebang support 2016-03-17 16:18:04 +01:00
jsteemann 2ceecda5f7 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-15 23:44:42 +01:00
Frank Celler d64bf2dc95 added srv:// endpoint 2016-03-15 23:25:07 +01:00
jsteemann fab3477a17 removed unused line 2016-03-15 18:38:00 +01:00
jsteemann 4f8265bfc8 temporary builder leaser 2016-03-15 14:08:03 +01:00
jsteemann 33df831f41 small optimizations for v8<->vpack 2016-03-14 22:22:35 +01:00
jsteemann a84c46d62b some optimizations for V8<->vpack conversion 2016-03-14 21:50:16 +01:00
jsteemann 3c6cdb5ddb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-14 09:14:54 +01:00
Frank Celler 601f8c5f00 fixed cleanup 2016-03-12 17:28:03 +01:00
Jan Steemann 7995cbb1ec ignore values of type undefined 2016-03-11 19:43:36 +01:00
Jan Steemann c814332503 fixed materialization of _id values 2016-03-11 14:15:59 +01:00
Max Neunhoeffer e77159b008 New returnNew option for insert. 2016-03-11 12:44:36 +01:00
Jan Steemann ff24255cdb added isSingleOperationTransaction 2016-03-11 08:54:11 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann 9f84b767d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 08:11:01 +01:00
Frank Celler 60cd363f19 moved build date to file build-date.h.in 2016-03-05 09:49:31 +01:00
Max Neunhoeffer 4cb42662f3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-04 15:19:26 +01:00
jsteemann 053648b36c simplifications 2016-03-04 02:25:18 +01:00
Max Neunhoeffer 0770a4b665 Fix TRI_V8ToVPack to always deliver if no error is returned. 2016-03-02 10:33:09 +01:00
Jan Steemann 3e82064770 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 14:59:08 +01:00
Frank Celler 37a0a7fc05 Merge branch 'devel' of github.com:arangodb/arangodb into solaris 2016-02-25 10:56:14 +01:00
jsteemann 74fa6cf207 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-25 00:02:03 +01:00
jsteemann b3a20e915f simplified some logging 2016-02-24 22:48:56 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Frank Celler 24649f44bd move to strings and away from regexp 2016-02-23 15:25:07 +01:00
Jan Steemann 70d44f06fa Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-23 13:22:46 +01:00
Frank Celler d142a5ddb4 move to strings and away from regexp 2016-02-23 12:26:09 +01:00
Jan Steemann 8b8101fc59 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-19 11:44:06 +01:00
Jan Steemann adde757e46 move v8 try-catch into handle scopes 2016-02-19 11:42:44 +01:00
Michael Hackstein 7ed6754389 Fixed usage of document, to also include customTypeHandler for export to V8 2016-02-18 13:21:06 +01:00
Jan Steemann 64f85c526b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-16 09:53:36 +01:00
Alan Plum 6593f3d358 Clean up stacktraces 
Fixes #1564, #1565, #1744.
 2016-02-15 22:56:29 +01:00
Jan Steemann 9898103bc1 initial vpack documents 2016-02-11 21:56:10 +01:00
jsteemann d2001b6c0a fixed leak 2016-02-07 00:06:38 +01:00
Jan Steemann 657ac8d50f fixes for Windows 2016-02-04 09:36:29 +01:00
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
jsteemann ae25d2b53b removed `using namespace std` 2016-01-31 18:22:00 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann 353c9732b7 removed last LOG_xxx macros 2016-01-30 04:03:18 +01:00
jsteemann dbd5c500cb remove TRI_ENABLE_LOGGING 2016-01-30 00:46:40 +01:00
jsteemann 9482ee1cca use Logger 2016-01-30 00:08:35 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Max Neunhoeffer bee3f7e21a Cleanup ClusterComm library. Allow singleRequest asyncRequests. 
Also run ClusterComm sender thread and connection manager in
single server mode.
 2016-01-26 11:05:15 +01:00
Frank Celler 8a7f409380 added fs.append 2016-01-24 11:34:13 +01:00
jsteemann 9ba3b68109 cppcheck 2016-01-23 16:22:39 +01:00
Frank Celler d3330bdf9b fixed temp path to honor TMPDIR 2016-01-22 13:16:25 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
jsteemann ef67a496e6 more checks & asserts, C API cleanup 2016-01-20 22:08:11 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
Michael Hackstein f254f83dfb Moved DebugClearFailure to v8-actions, alowing it to be executed in Cluster as well 2016-01-16 15:19:49 +01:00
jsteemann 1b959c827d more const unification 2016-01-15 00:09:52 +01:00
jsteemann f66eb007cd some const unification 2016-01-15 00:03:03 +01:00
Michael Hackstein d999c7063b Moved Debug functions to V8Server and made them available via a debug endpoint. This is used to distributed debugSetFailAt in cluster, s.t. DBServers use these functions as well 2016-01-14 17:14:18 +01:00
jsteemann 14216e4ca5 Valgrind garbage collection shutdown fix attempt 2016-01-12 14:27:23 +01:00
Jan Steemann 687d6133f0 comments reformatting 2016-01-11 09:52:39 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 50c0e18d53 removed useless con|destructor comments 2016-01-07 21:19:53 +01:00
Jan Steemann 8b4b6a1943 moved docu blocks into their own files 2016-01-07 16:03:17 +01:00
Wilfried Goesgens 7fc4b356e4 Revert formattings that break documentation parts. 2016-01-07 15:12:04 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann 9a1d7959e9 merged string-buffer.h and StringBuffer.h 2016-01-06 13:24:09 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Jan Steemann edb4d2dc4c fix some VS compile errors 2016-01-05 14:10:10 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
Max Neunhoeffer c7f00bfeda Continue work on TODOs. 2015-12-23 14:40:04 +01:00
Jan Steemann ca95afef2c fixed undefined behavior 2015-12-17 16:09:54 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
jsteemann 1e98af01ba set cloexec for file descriptors 2015-12-15 20:30:28 +01:00
Jan Steemann 2bdbb13e2c Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-11 14:13:36 +01:00
jsteemann 18e47457a6 fixes 2015-12-11 13:29:18 +01:00
Michael Hackstein 02784df7f8 Updated file list function to use std::vector<std::string> instead of TRI_string_vector_t. 2015-12-08 15:10:03 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +01:00
Jan Steemann cf7fa63a53 issue #1036: allow aborting waiting HTTP requests from the ArangoShell 2015-12-03 18:55:51 +01:00
Jan Steemann 931e3f93ae issue #1036: implement CTRL-C handling in ArangoShell for Windows 2015-12-03 16:25:19 +01:00
Jan Steemann d572f3ed03 Merge branch 'aql-multi-modify' of https://github.com/arangodb/arangodb into devel 2015-12-03 11:38:30 +01:00
Michael Hackstein 3ea14e66a3 Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-12-03 10:19:17 +01:00
jsteemann 9fa0f6d3a7 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-multi-modify 2015-12-02 16:38:50 +01:00
Jan Steemann eb8899d9ae applied changes suggested by cppcheck 2015-12-02 10:17:14 +01:00
Jan Steemann a66368e10c Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-11-26 17:13:33 +01:00
Michael Hackstein 7bf37620bb Merge branch 'devel' of github.com:arangodb/arangodb into JHMH 2015-11-26 16:32:26 +01:00
Jan Steemann 389c3e0cf0 small optimizations 2015-11-26 16:31:25 +01:00
Jan Steemann 9ef5b4746a removed several includes from Common.h 2015-11-25 12:21:55 +01:00
Jan Steemann 5518244942 less iostream-ing 2015-11-24 13:55:06 +01:00
Jan Steemann 89e0f887b9 velocypack update 2015-11-19 13:28:40 +01:00
jsteemann f5e71197ce document creation 2015-11-17 01:46:58 +01:00
Jan Steemann b0ea7dd562 added V8ToVPack conversion 2015-11-13 17:27:35 +01:00
Jan Steemann e7be8952bb updated vpack library 2015-11-09 15:26:12 +01:00
Michael Hackstein 298d00908c Added an implementation to transform a VelocyPack into a V8::Handle<V8::Value> 2015-11-08 15:00:13 +01:00
Wilfried Goesgens 7a54982eb4 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-06 13:53:21 +01:00
Jan Steemann 3c04642550 moved object cache from `db` object into object of its own 2015-11-05 14:20:02 +01:00
Wilfried Goesgens 179660e87c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-04 17:07:09 +01:00
Frank Celler 3500e569a8 reverted 011117edee, 72c8847324, 5da5715fa9, a371aac4af, 7decf1560a, 0331ff7993, 6ec2014052, ae8d686ae6, 7efd0a1ec7, 3449b87e2c, d35a4034ef, 7b3c1ed4dd, e0c88e4a1a, 952d643101, fc9de8ed08, 2f4319b31a, 105662d5ba, 0a08833b0f, 4ac19a99fc, 4c5494c67d, 528bb85b30, 528bb85b30 becuase of missing CLA 2015-11-03 10:19:25 +01:00