1
0
Fork 0
Commit Graph

914 Commits

Author SHA1 Message Date
Max Neunhoeffer 925051afe4 Rename an argument and add a comment. 2017-04-26 08:25:42 +02:00
Frank Celler 0d71aaeb9d fix for compiler path 2017-04-20 20:53:04 +02:00
Frank Celler 9064305c95 malloc_stats_print under Linux, je_malloc_stats_print under Apple 2017-04-19 20:40:34 +02:00
Frank Celler 1a6cadbfe1 added generated files 2017-04-19 20:36:31 +02:00
Frank Celler 1bad259868 added generated files 2017-04-19 20:35:15 +02:00
Frank Celler c59b527865 added generated configure script 2017-04-19 20:29:15 +02:00
Frank Celler f1d0c5eba1 added jemalloc feature 2017-04-19 19:57:54 +02:00
Frank Celler 5ef5c5650c added rocksdb CMakeLists 2017-04-19 19:57:54 +02:00
Frank Celler 406d09befa added jemalloc 4.5.0 2017-04-19 19:57:54 +02:00
Wilfried Goesgens ce45df98d7 remove debug print 2017-04-06 14:19:24 +02:00
Frank Celler 45a4fac4d3 removed v from version 2017-03-23 22:27:48 +01:00
Frank Celler baafc2ceee removed V8 prefix 2017-03-23 22:15:12 +01:00
Frank Celler 74cf8a0f75 fixed boost version 2017-03-23 21:25:54 +01:00
Wilfried Goesgens 3ee0472ed3 unify handling of 3rdparty revisions 2017-03-23 16:28:24 +01:00
Simon Grätzer e8258063b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	3rdParty/V8/v8
#	CMakeLists.txt
2017-03-15 12:59:22 +01:00
Wilfried Goesgens b17ba1d967 add .gitignored files 2017-03-14 16:39:53 +01:00
Wilfried Goesgens 1cbb0ee262 add missing file 2017-03-14 16:32:10 +01:00
Wilfried Goesgens 45595b8f4d switch V8 from git submodule to flat copy 2017-03-14 16:02:40 +01:00
Wilfried Goesgens 9acbada99a remove git submodules - they don't work reliably. 2017-03-14 15:26:08 +01:00
Simon Grätzer 876bbb98f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 23:27:11 +01:00
Frank Celler 41c0bd3332 do not enable -Werror for rocksdb 2017-03-13 18:13:08 +01:00
Wilfried Goesgens 646baee446 adopt rocksdb cmake for elderly systems 2017-03-13 17:48:17 +01:00
Wilfried Goesgens 08a1473235 move forward so windows may compile properly 2017-03-13 14:46:39 +01:00
Simon Grätzer fb560eece1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 13:02:55 +01:00
Simon Grätzer 7b35f75b23 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/GeneralServer/GeneralServerFeature.cpp
2017-03-13 12:25:28 +01:00
Wilfried Goesgens 65af41e802 where did this submodule vanish to? 2017-03-13 12:25:21 +01:00
jsteemann 45a68f54f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-13 12:10:54 +01:00
jsteemann 454d583863 fix building tests 2017-03-13 12:06:11 +01:00
Simon Grätzer ddf25e6352 Changed rocksdb commit 2017-03-13 12:00:14 +01:00
Wilfried Goesgens faa100644e fix include of rocksdb 2017-03-13 11:45:13 +01:00
Wilfried Goesgens 5fe4a431a0 move rocksdb subrepo pointer forward 2017-03-13 10:49:32 +01:00
Simon Grätzer 871272d7c1 Merge from devel 2017-03-12 12:32:22 +01:00
Wilfried Goesgens 00bcb07624 exclude rocksdb gtest from the build 2017-03-10 15:31:57 +01:00
Wilfried Goesgens 3c6bdccde3 add submodule rocksdb 2017-03-10 14:42:02 +01:00
Wilfried Goesgens 4b41444c0a remove in working copy rocksdb 2017-03-10 14:40:36 +01:00
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
Andreas Streichardt 408a831611 Revert "Fix options"
This reverts commit 80da46e2b0.
2017-03-07 10:16:47 +01:00
Andreas Streichardt 80da46e2b0 Fix options 2017-03-07 08:42:38 +01:00
jsteemann b95f082718 upgraded version of bundled zlib library from 1.2.8 to 1.2.11 2017-03-07 08:15:45 +01:00
Andreas Streichardt 59b49485b5 Merge branch 'devel' into catch_tests_ng 2017-03-06 18:34:46 +01:00
Andreas Streichardt ce3c17e7de Merge branch 'devel' into catch_tests_ng 2017-03-06 17:59:26 +01:00
jsteemann 8ba2654540 cleanup 2017-03-06 16:08:49 +01:00
jsteemann e27cf1bc5e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 15:55:00 +01:00
Simon Grätzer c0a390aefe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-06 15:53:43 +01:00
jsteemann f7b819579d attempt to fix clang build 2017-03-06 15:40:03 +01:00
Andreas Streichardt 6168e81b2e first steps 2017-03-02 19:23:32 +01:00
jsteemann 8eb6ccfa85 pulled some fixes from linenoise-ng repository 2017-03-02 15:23:30 +01:00
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
2017-03-01 14:52:35 +01:00
Dan Larkin 290f6c182d Reverted mistaken V8 change. 2017-02-24 16:07:42 -05:00
Dan Larkin 09600f0971 Added hash cache system. 2017-02-24 15:31:40 -05:00