1
0
Fork 0
Commit Graph

27261 Commits

Author SHA1 Message Date
Max Neunhoeffer c074f47f4e Port a velocypack fix. 2016-03-14 12:12:54 +01:00
Max Neunhoeffer 50514610fc Change id and key validation to use length. 2016-03-14 10:23:08 +01:00
jsteemann 91c67e0a37 fixed compile error 2016-03-14 08:34:11 +01:00
jsteemann e8662b5265 preparation 2016-03-12 12:42:29 +01:00
jsteemann 04ff5dafe3 removed TODO 2016-03-12 12:23:25 +01:00
jsteemann 47c7c6ccff renamed type 2016-03-12 12:12:25 +01:00
jsteemann 6902c7e53c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-12 11:47:39 +01:00
jsteemann bc1563650b added missing function 2016-03-12 11:47:08 +01:00
Max Neunhoeffer 627ef39b81 Finish returnNew and returnOld for RestDocumentHandler. 2016-03-11 23:16:45 +01:00
Max Neunhoeffer 01f942239e Fix Rest handler. 2016-03-11 21:50:35 +01:00
Max Neunhoeffer 1cf6299399 RestDocumentHandler returnNew and returnOld. 2016-03-11 21:45:47 +01:00
Jan Steemann 7995cbb1ec ignore values of type undefined 2016-03-11 19:43:36 +01:00
Jan Steemann 6d6d2e9e9c do not set useless bind parameters 2016-03-11 19:42:14 +01:00
Jan Steemann 273deddaee Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 19:11:58 +01:00
Jan Steemann c4ad66ce6d startup fixes 2016-03-11 19:11:45 +01:00
Andreas Streichardt b29c437b7f Add more error info 2016-03-11 18:22:12 +01:00
Jan Steemann 4569aa9aac fixed UPSERT 2016-03-11 18:08:57 +01:00
Jan Steemann ba91761a66 fix resetting of cursors 2016-03-11 17:56:23 +01:00
Jan Steemann 4385bd8a4e Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 16:38:15 +01:00
Jan Steemann 8b281b0538 repaired explain 2016-03-11 16:38:01 +01:00
Max Neunhoeffer 8f6cd501aa Change behaviour of remove(), return data, allow returnOld. 2016-03-11 16:35:55 +01:00
Jan Steemann 99c6786858 fixed AQL UPDATE/REPLACE 2016-03-11 15:32:50 +01:00
Jan Steemann 39516d6980 fixed INSERT 2016-03-11 15:20:03 +01:00
Jan Steemann 5f966dd506 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 15:13:44 +01:00
Jan Steemann 0ced13c4ff fixed AQL REMOVE 2016-03-11 15:13:34 +01:00
Max Neunhoeffer 1c94f8d1be returnNew and returnOld, progress. 2016-03-11 15:12:58 +01:00
Max Neunhoeffer 968d1cfd1f Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-11 15:12:40 +01:00
Jan Steemann 44070b149e fixes for AQL 2016-03-11 14:54:14 +01:00
Jan Steemann c814332503 fixed materialization of _id values 2016-03-11 14:15:59 +01:00
Max Neunhoeffer 58269de240 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-11 13:10:30 +01:00
Max Neunhoeffer 0dad5a6c7e Finish implementation of returnNew and returnOld. 2016-03-11 13:10:14 +01:00
Jan Steemann 74073bf9cb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 13:04:02 +01:00
Jan Steemann 7b68bd2656 remove printing 2016-03-11 13:03:52 +01:00
Jan Steemann 0389fc41be Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 12:44:56 +01:00
Jan Steemann 724ce2e081 Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 12:44:52 +01:00
Jan Steemann da691ed39c fixed memory issues 2016-03-11 12:44:38 +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
Max Neunhoeffer 06be35dd9b Fix RestDocumentHandler after recent changes to rev management. 2016-03-11 10:09:06 +01:00
Max Neunhoeffer 447c95af83 Change revision management in Transaction.cpp. 2016-03-11 09:53:20 +01:00
Max Neunhoeffer a8b41636a7 Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-11 09:52:17 +01:00
Jan Steemann cae40ca1cd less waitForSync usage 2016-03-11 09:15:50 +01:00
Jan Steemann e7f1a7775d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-03-11 09:12:16 +01:00
Jan Steemann 4074ba47ee fixed invalid member name 2016-03-11 09:12:02 +01:00
Max Neunhoeffer be45ecd09d Merge branch 'spdvpk' of ssh://github.com/ArangoDB/ArangoDB into spdvpk 2016-03-11 09:00:21 +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
Max Neunhoeffer 9dbe9acf5f Lose MasterPointer.cpp (all header now). 2016-03-11 08:43:58 +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