1
0
Fork 0
Commit Graph

3628 Commits

Author SHA1 Message Date
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Kaveh Vahedipour d247e7a3bd mop is fixing the cluster load 2016-04-13 15:36:11 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Kaveh Vahedipour ab5c5bd84c new simple URI form from endpoint 2016-04-13 11:21:52 +02:00
Michael Hackstein a14d7dffe2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-13 08:30:48 +02:00
Jan Steemann c0fd5c5f78 removal of some JSON 2016-04-12 18:21:11 +02:00
Wilfried Goesgens d0692b90f0 fix typo 2016-04-12 15:12:36 +02:00
Jan Steemann 0c272978d9 use THROW_ARANGO_EXCEPTION 2016-04-12 15:04:17 +02:00
Michael Hackstein 50535f6ad8 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 14:12:06 +02:00
Kaveh Vahedipour 0efa889f43 new simple URI form from endpoint 2016-04-12 14:10:18 +02:00
Michael Hackstein 97623706b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-11 10:09:43 +02:00
Michael Hackstein df497eb8b2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-10 14:09:25 +02:00
jsteemann 607efe8f89 removed unused function 2016-04-09 10:57:07 +02:00
jsteemann 163a61f17b prevent races on shutdown 2016-04-09 00:18:41 +02:00
jsteemann e839150857 use log topics 2016-04-09 00:17:06 +02:00
Jan Steemann f2e2dbb435 pacify valgrind
added assertion

added assertions
2016-04-08 15:05:08 +02:00
Jan Steemann 9b844340a3 fix pid 2016-04-08 14:40:45 +02:00
Michael Hackstein d67b203382 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-08 13:15:16 +02:00
Jan Steemann 3a582af765 fix Windows build 2016-04-08 13:09:32 +02:00
Michael Hackstein 541395a262 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-08 12:42:59 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Michael Hackstein 12d973504c Fixed babies creation in cluster with undefined keys. 2016-04-08 10:53:11 +02:00
Jan Steemann e4b1dd8f5f fixed tests for TRI_HashJsonByAttributes() 2016-04-07 19:55:42 +02:00
Jan Steemann 6df7221691 cleanup 2016-04-07 17:08:44 +02:00
Jan Steemann 99719c6957 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 17:02:15 +02:00
Jan Steemann 19ab17ad3b Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 16:51:25 +02:00
Jan Steemann 46df140751 removed unused method 2016-04-07 16:40:30 +02:00
Jan Steemann 8a86c0132e removed unused variables 2016-04-07 16:40:07 +02:00
Jan Steemann ac99d29dd4 fixed misusage 2016-04-07 16:39:53 +02:00
Michael Hackstein d792432d95 Replaced HashByAttributes to only use VelocyPack. Will be removed soon. Also removed some obsolete code 2016-04-07 16:13:43 +02:00
Wilfried Goesgens 8a0cc60266 i.e. github requires a useragent, thus enable it. 2016-04-07 14:51:01 +02:00
Jan Steemann 4b0c01975b Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 14:30:36 +02:00
Wilfried Goesgens 32338ef07f Also properly detect the end of the header when the server only sends \n 2016-04-07 14:26:44 +02:00
Frank Celler f6c818a399 removed tolower for NC 2016-04-07 14:15:30 +02:00
Kaveh Vahedipour bb4d520467 VelocyPackHelper buildEmptyObject was buggy 2016-04-06 16:33:56 +00:00
Michael Hackstein f8f403e55d Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-06 16:45:37 +02:00
Michael Hackstein 3ad837f17c Added a function to hash specific attributes of a velocypack Object 2016-04-06 16:43:59 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Max Neunhoeffer b1963d2cee Fix replication in the sense that revs are now copied over. 2016-04-05 10:27:43 +02:00
Andreas Streichardt 49a3d3e018 Cleaning up the ifs....Greatly simplifying testing.js 2016-04-04 19:26:30 +02:00
Frank Celler 0c5a6bcaf6 fixed boost tests 2016-04-04 13:25:57 +02:00
Jan Steemann d8b993f0fb fixed some issues with tests 2016-04-04 10:47:04 +02:00
Jan Steemann 9f213281b1 fixed some issues with tests 2016-04-04 10:13:13 +02:00
Max Neunhoeffer f27e11bf64 Fix compilation. 2016-04-04 08:48:10 +02:00
Frank Celler e536234aae bound check 2016-04-01 12:26:46 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +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
Michael Hackstein a5d20b0041 Activated Externals in OperationCursor. This commit might break tests again. 2016-03-29 11:08:31 +02:00