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

3495 Commits

Author SHA1 Message Date
jsteemann 91c67e0a37 fixed compile error 2016-03-14 08:34:11 +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
Jan Steemann 74073bf9cb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 13:04:02 +01:00
Max Neunhoeffer e77159b008 New returnNew option for insert. 2016-03-11 12:44:36 +01:00
Wilfried Goesgens f7b80bf656 Add handler for TLS V1.2 as sugested by kurtkincaid in #1771 2016-03-11 11:18:28 +01:00
Jan Steemann 4c84d3f9ee Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 08:54:40 +01:00
Jan Steemann ff24255cdb added isSingleOperationTransaction 2016-03-11 08:54:11 +01:00
Frank Celler 5cac7abb5b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-10 23:00:22 +00:00
Frank Celler 46b702b2cb fixed colors 2016-03-10 22:59:51 +00:00
Wilfried Goesgens 8eb24c3a40 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-10 23:28:12 +01:00
Wilfried Goesgens ddc5369949 test for OPENSSL_NO_SSL3_METHOD; this fixes #1773 2016-03-10 23:26:36 +01:00
Frank Celler ab6224e2ae cleanup 2016-03-10 23:02:59 +01:00
Frank Celler f4335d4a7e fixed color output 2016-03-10 21:56:29 +00:00
Jan Steemann 11d9451c8c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-10 19:26:05 +01:00
Frank Celler 6dbb6ceb03 changed newline for windows 2016-03-10 14:22:26 +00:00
Frank Celler e68fa98154 fixed colors 2016-03-10 12:05:44 +00:00
Michael Hackstein 23f845de05 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-03-10 10:46:30 +01:00
Michael Hackstein 4c4c117059 Partially Adopted Traverser to new transaction API. This is still work in Progress. It compiles but it will not work yet. 2016-03-10 10:42:20 +01:00
Frank Celler dd36dd55e6 fixes for windows 2016-03-10 09:25:54 +00:00
jsteemann 279fb105e2 cppcheck 2016-03-09 22:57:49 +01:00
Jan Steemann 878865c53a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 17:57:07 +01:00
Frank Celler ce28f5492f convert to escape-x notation 2016-03-09 16:29:40 +01:00
Frank Celler 2d09d64d8f convert to escape-x notation 2016-03-09 16:25:37 +01:00
Frank Celler 8632644886 removed warning 2016-03-09 10:57:14 +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 e946729306 aqlvalue$ 2016-03-08 18:52:34 +01:00
Jan Steemann 0496f99b21 expression now using VelocyPack 2016-03-08 13:03:03 +01:00
Michael Hackstein 15b4d0734a Added a generic getAndCheckNumeric value to VPackHelper 2016-03-07 19:03:40 +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
Jan Steemann 1c150d4d6e Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-04 18:35:40 +01:00
Max Neunhoeffer 4cb42662f3 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-04 15:19:26 +01:00
Jan Steemann be8a520ab8 removed dead code 2016-03-04 14:52:15 +01:00
Jan Steemann eb82d96836 constexpr 2016-03-04 12:33:59 +01:00
jsteemann 0c580f1076 removed unused includes 2016-03-04 02:37:20 +01:00
jsteemann 630c8f44aa use correct includes 2016-03-04 02:30:47 +01:00
jsteemann 053648b36c simplifications 2016-03-04 02:25:18 +01:00
jsteemann c2c509ef58 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 21:27:13 +01:00
jsteemann ffc36b1841 prevent duplicate logging 2016-03-03 21:20:05 +01:00
Jan Steemann 4e0328d46f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-03 17:59:27 +01:00
Jan Steemann 337fc4bca4 remove std::mutex 2016-03-03 17:47:46 +01:00
Jan Steemann 16588e33d3 less json 2016-03-03 17:30:15 +01:00
Jan Steemann 3cadcd5340 less json 2016-03-03 15:40:00 +01:00
Max Neunhoeffer d2d785ec41 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-03 09:04:54 +01:00
Wilfried Goesgens ff6ecda6e2 grr 2016-03-02 17:54:41 +01:00
Wilfried Goesgens 488149e424 comment out everything for WSACleanup 2016-03-02 17:52:46 +01:00
Wilfried Goesgens 7696297038 Disable WSACleanup for now, we don't know the right time to call it in all cases. 2016-03-02 17:50:45 +01:00
Jan Steemann 4c03f4bf8d simplification 2016-03-02 15:50:52 +01:00