1
0
Fork 0
Commit Graph

25055 Commits

Author SHA1 Message Date
Jan Steemann 8bb568e02b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-12-11 16:35:13 +01:00
Jan Steemann a61589cfdc jslint 2015-12-11 16:35:02 +01:00
Jan Steemann 43eff8f0e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-11 16:33:35 +01:00
Wilfried Goesgens f39cf6485c Add velocypack detection to CMakeList 2015-12-11 16:30:19 +01:00
Jan Steemann 5ae891ac20 fix for issue #1603 2015-12-11 16:24:33 +01:00
Jan Steemann 6ffa4062de Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-11 16:07:48 +01:00
Alan Plum 3c804390cd More consistency 2015-12-11 15:26:41 +01:00
Alan Plum 70ad91c122 Consistency 2015-12-11 15:25:51 +01:00
Jan Steemann 2bdbb13e2c Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-11 14:13:36 +01:00
Jan Steemann ca9a25951b removed console.log 2015-12-11 13:44:34 +01:00
Alan Plum a900077938 Lint 2015-12-11 13:35:25 +01:00
Max Neunhoeffer 95b311f802 Merge branch 'devel' into ClustUp1 2015-12-11 13:33:33 +01:00
jsteemann 18e47457a6 fixes 2015-12-11 13:29:18 +01:00
Max Neunhoeffer c11ec07564 Merge branch 'devel' into ClustUp1 2015-12-11 13:28:07 +01:00
Alan Plum d93e1e91e8 User app should also not hardcode collections 2015-12-11 13:23:50 +01:00
Max Neunhoeffer 107ef90916 Improve logging of unittests. 2015-12-11 13:23:26 +01:00
Wilfried Goesgens 7c07b502a5 Add howto load the example set used in the samples 2015-12-11 13:02:36 +01:00
Wilfried Goesgens 8c1d6efaaf Improve error message 2015-12-11 13:02:23 +01:00
Michael Hackstein de680bb8bb Merge branch 'vpack' of github.com:arangodb/arangodb into vpack 2015-12-11 09:31:03 +01:00
Michael Hackstein ba1a520e8c Fixed a bug in Vocbase collection to VPack. It did not include the collection properties properly 2015-12-11 08:35:44 +01:00
jsteemann c40bfe6557 cppcheck 2015-12-10 22:40:40 +01:00
Jan Steemann a406ced17c Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-10 21:33:43 +01:00
Jan Steemann a1a95f227f fix VS warning 2015-12-10 21:16:03 +01:00
Jan Steemann 4335af50e7 replication improvements 2015-12-10 19:07:10 +01:00
Jan Steemann f2b9e1139b replaced levenshtein distance implementation 2015-12-10 18:43:44 +01:00
Frank Celler 9f408a81ee removed xxhash 2015-12-10 18:35:39 +01:00
Jan Steemann 09d34087ea rename ditch type 2015-12-10 17:13:11 +01:00
Jan Steemann fcf978a422 do not print overly long string values 2015-12-10 17:06:25 +01:00
Michael Hackstein 2520874c03 Preparation to remove TRI_json_t from Traversers. But has to many side effects to be removed in one pass 2015-12-10 16:43:08 +01:00
Michael Hackstein c959072733 Adaption to new vocbase-defaults format 2015-12-10 16:42:13 +01:00
Michael Hackstein 3f029d29c7 Refactoring of vocbase-defaults. It now uses VPack instead of TRI_json_t and it uses Class functions instead of global functions 2015-12-10 16:41:47 +01:00
Michael Hackstein eb417a2ef3 Removed TRI_json_t from vocbase main file 2015-12-10 15:30:36 +01:00
Max Neunhoeffer b6b78c4acc Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-10 15:28:30 +01:00
Max Neunhoeffer 105ac4d562 Remove xxhash. 2015-12-10 15:28:18 +01:00
Frank Celler a469e38855 added new lib (fasthash and xxhash) 2015-12-10 15:10:20 +01:00
Michael Hackstein 1a33c10557 Removed TRI_json_t from Vocbase/auth and did some refactoring in the internals there. Bye Bye CORE_MEM_ZONE 2015-12-10 14:08:49 +01:00
Alan Plum a7fa6b395a Add session fix to changelog 2015-12-10 12:08:20 +01:00
Alan Plum 58cf3a60cd Don't use Foxx.Repository for system sessions
Fetching the collection dynamically helps avoid an error when the collection is removed and recreated after the app is mounted.
2015-12-10 12:02:29 +01:00
Max Neunhoeffer d5eaccbfe5 Merge branch 'devel' into ClustUp1 2015-12-10 11:35:08 +01:00
Michael Hackstein 622fafa0fc Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-10 11:13:42 +01:00
Michael Hackstein e4f38929b5 Removed TRI_json_t from ApplicationEndpointServer 2015-12-10 11:11:16 +01:00
Wilfried Goesgens 399c44278e Add left-to-right and right-to-left guards around the hebrew bye message 2015-12-10 11:09:21 +01:00
Michael Hackstein b492b154d8 Added a velocyPackFromFile to the VelocyPackHelper 2015-12-10 11:02:19 +01:00
Jan Steemann abb39b8c64 fix warnings in Visual Studio 2015-12-10 10:44:17 +01:00
Jan Steemann a36e4827c7 build fix 2015-12-10 10:43:59 +01:00
Michael Hackstein 1af985003d Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-10 10:26:14 +01:00
Michael Hackstein 1e74d3eae0 Removed all references to TRI_json_t in arangosh 2015-12-10 10:25:44 +01:00
Michael Hackstein e39c1ea6c8 Now finally removed all TRI_json_t references in V8 Client arangodump. 2015-12-10 00:26:53 +01:00
Michael Hackstein 84bfb63a73 Style fix 2015-12-10 00:13:06 +01:00
Michael Hackstein 005f431bbf Removed TRI_json_t from V8Client arangodump. 2015-12-10 00:12:55 +01:00