1
0
Fork 0
Commit Graph

29 Commits

Author SHA1 Message Date
jsteemann a67877de66 removed unused shaping functionality 2016-03-09 23:33:10 +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
jsteemann adae2e7c67 fixed saving 2016-02-29 23:31:21 +01:00
Jan Steemann bd9293802d marker changes, unfinished 2016-02-26 19:39:17 +01:00
Frank Celler 4b2b85f1b5 more cleanup 2016-02-24 19:19:04 +01:00
Michael Hackstein 6315ec26a5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-03 10:48:27 +01:00
jsteemann d9de65acf8 remove now useless casts when invoking logger 2016-02-02 21:38:01 +01:00
jsteemann 3aed47d8e2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-02-01 13:15:05 +01:00
Michael Hackstein 197292a230 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 13:02:49 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Michael Hackstein b85d5d4a26 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-02-01 09:49:29 +01:00
Michael Hackstein 9ea8e3ea0c Started to write merge of two slices. This is not yet working for null means delete, works for all other merges. 2016-02-01 09:49:19 +01:00
jsteemann 54c796b6e8 fixed issues identified by `-fsanitize=undefined` 2016-01-31 23:30:41 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +01:00
Jan Steemann cd4cbae6ce ported fixes to devel 2016-01-29 19:05:27 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 9beeb09f37 fix out-of-memory situations 2016-01-22 13:24:33 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +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
Michael Hackstein 36c41c5e14 Added a helper function to transform VPack to shaped-json 2015-12-07 14:20:52 +01:00
jsteemann fad9782a4a removed unused functions 2015-10-23 01:22:41 +02:00
CoDEmanX 3a9648d78a More Americanization 2015-09-03 22:25:43 +02:00
Jan Steemann 2499dca0a3 compile debug function conditionally 2015-08-31 10:32:01 +02:00
Jan Steemann 907e6368c6 some unused function cleanup 2015-08-17 12:43:09 +02:00
Jan Steemann 6d7ccd7699 move shaper to cxx 2015-07-28 17:38:31 +02:00