1
0
Fork 0
Commit Graph

721 Commits

Author SHA1 Message Date
jsteemann 325aa13795 merge with velocypack 2016-06-06 16:59:36 +02:00
Andreas Streichardt bea2ca257b broken syntax 2016-06-06 09:57:26 +02:00
Andreas Streichardt 569dd0de04 Do not hardcode march=native but use the one arangodb uses
fixing SIGILL on AWS when using a modern machine to build a debian image
2016-05-27 11:43:41 +02:00
Jan Steemann fb07580500 forward port Comparator bugfix from 5ff7901e24 2016-05-23 15:58:02 +02:00
Frank Celler d4291b36e5 added sanity check for CMAKE_BUILD_TYPE 2016-05-19 16:10:36 +02:00
Wilfried Goesgens 69827a5294 Adjust memory model to MT since arangod uses threads. 2016-05-19 09:44:14 +02:00
Wilfried Goesgens c90f631a78 Fix include of SSIZE_T 2016-05-18 18:18:08 +02:00
Andreas Streichardt 9094ea3a0b Fix solaris build 2016-05-17 18:16:45 +02:00
Wilfried Goesgens c7f13cde14 Define ssize_t the same way in snappy as in rocksdb. 2016-05-17 17:27:38 +02:00
jsteemann 0828abbb5c query less documents 2016-05-13 14:26:34 +02:00
jsteemann abb0f36d55 fixed hashes 2016-05-12 11:11:20 +02:00
jsteemann 11f2afad44 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-12 00:00:37 +02:00
jsteemann 9b6467dc60 fix hash function 2016-05-11 22:16:36 +02:00
Frank Celler 1119ceada6 added -fno-delete-null-pointer-checks 2016-05-11 17:39:33 +02:00
Frank Celler 1c9d99d8ec removed SNAPPY_STATIC_LIB 2016-05-11 17:34:39 +02:00
Andreas Streichardt 64a567a5a0 ROCKSDB uses static snappy from 3rdparty 2016-05-11 16:30:24 +02:00
jsteemann bfd5596359 optimizations 2016-05-11 11:50:07 +02:00
jsteemann 3f61b70192 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-10 19:21:32 +02:00
Wilfried Goesgens 31df95118a Fix define for windows. 2016-05-10 19:13:00 +02:00
jsteemann 213ade22a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-10 19:01:30 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
Wilfried Goesgens d0eca813e9 reverse check; it doesn't work doing that in the preprocessor. 2016-05-10 18:57:40 +02:00
Wilfried Goesgens ce8371d307 Fix windows absence of ssize_t 2016-05-10 18:54:33 +02:00
Wilfried Goesgens ec3d51dfbd fix library name. 2016-05-10 17:27:27 +02:00
Wilfried Goesgens 56ec020600 Prepare to pass our jemalloc configure state into rocksdb 2016-05-10 16:45:15 +02:00
Wilfried Goesgens e2da3d4912 check for fcntl for enabling fallocate; only enable posix mmap for posix platforms. 2016-05-10 16:45:15 +02:00
Wilfried Goesgens b2766e12a8 Don't override external defines. 2016-05-10 16:45:15 +02:00
Wilfried Goesgens 37fac2e40f Fix library list 2016-05-10 15:56:17 +02:00
Wilfried Goesgens 5e311be4ba Add missing test source file. 2016-05-10 15:39:50 +02:00
Wilfried Goesgens c77baed2db Move rocksdb after zlib & snappy 2016-05-10 15:35:15 +02:00
Wilfried Goesgens afef9a5466 Include libsnappy for rocksdb. 2016-05-10 15:33:58 +02:00
Wilfried Goesgens 704eeef880 configure system libraries per operating system. 2016-05-10 14:36:15 +02:00
Wilfried Goesgens 1763c5dc36 Revert #366d771b5247c271f9dbf22905e7f3d49e0d974c and set the policies for ubuntu. 2016-05-10 11:06:40 +02:00
Wilfried Goesgens 030233a642 Fix OS detection for rocksdb. this fixes #1814 2016-05-09 11:06:25 +02:00
Frank Celler 664a2e14f2 fixed 2.8 issue 2016-05-04 23:42:31 +00:00
ArangoDB a51f795b82 Merge branch 'devel' into json_agency_comm 2016-05-04 19:49:22 +00:00
Frank Celler 59aef959ac changed to static 2016-05-04 19:45:55 +02:00
Kaveh Vahedipour 35d604e9e0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 18:17:00 +02:00
Wilfried Goesgens 737cb058b8 Remove debug output, no more needed in-between-CMakeList.txt 2016-05-04 17:55:14 +02:00
Wilfried Goesgens 14fe556031 Merge branch 'devel' of github.com:arangodb/ArangoDB into dox-cox-pix-ex-rox-box 2016-05-04 17:27:39 +02:00
Wilfried Goesgens da3a12320a remove debug output 2016-05-04 17:26:47 +02:00
Wilfried Goesgens e3bf9cf42f use cmake inside of rocksdb for linux too. 2016-05-04 17:18:21 +02:00
Kaveh Vahedipour e623198d6c Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 17:06:23 +02:00
jsteemann 42c9394797 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-04 16:42:44 +02:00
jsteemann 852a6d7829 fixed compile warning 2016-05-04 16:42:37 +02:00
Frank Celler 5f0ae035b0 added default env variables 2016-05-04 16:25:18 +02:00
jsteemann c7effa2410 readded subdirectory 2016-05-04 15:05:54 +02:00
jsteemann 2a2ad584a5 updated gitignore 2016-05-04 15:01:40 +02:00
jsteemann 7ad08738af Merge branch 'devel' of https://github.com/arangodb/arangodb into dox-cox-pix-ex-rox-box 2016-05-04 14:54:45 +02:00
Max Neunhoeffer 0ac60a8fe7 Merge branch 'devel' into json_agency_comm 2016-05-04 11:15:02 +02:00