1
0
Fork 0
Commit Graph

4822 Commits

Author SHA1 Message Date
jsteemann a901b1e8fd make feature-order more deterministic 2017-05-04 00:40:44 +02:00
jsteemann 432ccde8dd expose RocksDB version 2017-05-03 23:44:43 +02:00
jsteemann 2e3d704d10 fix MSVC compile warnings 2017-05-03 15:47:45 +02:00
jsteemann dae15d774c honor unaligned memory access issues 2017-05-03 11:05:51 +02:00
jsteemann e58dddd566 debugging 2017-05-02 17:19:38 +02:00
Kaveh Vahedipour cb2420d7f5 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-28 11:57:28 +02:00
Kaveh Vahedipour c51e144678 ASAN runtime errors 2017-04-28 11:57:20 +02:00
jsteemann 8d5248932b lock unification 2017-04-28 09:12:31 +02:00
Jan Christoph Uhde 5fa2cffc63 fix warning 2017-04-27 15:51:19 +02:00
Jan Christoph Uhde 837763097a fix windows warning 2017-04-27 15:12:30 +02:00
jsteemann 8b7fe79ebb added isLocked() flag for ConditionLocker 2017-04-27 13:01:30 +02:00
Simon Grätzer 33ed35fa1f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-27 10:13:17 +02:00
jsteemann 0de4be0c1d fixed issue #2459 2017-04-27 09:16:37 +02:00
Simon Grätzer fa15b43088 Fixed typedefs 2017-04-26 19:27:11 +02:00
Simon Grätzer 29286a9c1b RocksDB WAL entries for transactions 2017-04-26 18:54:55 +02:00
jsteemann 8c52ccf6cf add experimental and undocumented flush option for fs.write 2017-04-26 14:52:42 +02:00
Frank Celler 33fda9275c Merge pull request #2451 from arangodb/feature/ldap-auth
Feature/ldap auth
2017-04-26 14:12:32 +02:00
Frank Celler b1f8fdbef9 Merge pull request #2456 from servusoft/devel
cross compiling
2017-04-26 13:59:36 +02:00
Simon Grätzer 6472c4928d Various warnings 2017-04-26 11:26:08 +02:00
Simon Grätzer d228a94462 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/Replication/InitialSyncer.cpp
2017-04-26 11:06:09 +02:00
baslr f45a7f07b1 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-26 10:52:50 +02:00
jsteemann 4289105eb3 fix shutdown issue 2017-04-25 16:09:01 +02:00
jsteemann 7344a03623 fix crashes 2017-04-25 15:47:11 +02:00
jsteemann bd5737c5e7 try to fix shutdown issues when collection opening thread is waiting forever for scheduler to finish 2017-04-25 14:20:00 +02:00
baslr 579718ad37 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-25 11:18:07 +02:00
jsteemann 0434d88ab4 rocksdb options 2017-04-25 02:22:00 +02:00
Frank Celler f94df236a3 added 'x-content-type-options: nosniff' to avoid MSIE bug 2017-04-24 18:47:56 +02:00
baslr 9a78fc650b Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 15:37:18 +02:00
Kaveh Vahedipour c9c4f6ccef Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-24 15:13:52 +02:00
Kaveh Vahedipour ccc388a940 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:13:40 +02:00
Wilfried Goesgens ea3075e817 comment out the windows unhandled exception handler 2017-04-24 15:13:40 +02:00
Kaveh Vahedipour c099c6daa9 more dictributeShardsLike code mergedfrom 3.1 2017-04-24 15:12:38 +02:00
baslr 3d9f58bb70 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-24 12:45:35 +02:00
jsteemann b24f4a9435 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 18:14:31 +02:00
Andreas Streichardt 7322e3bff3 Allow seeding of randomgenerator for tests 2017-04-21 18:08:49 +02:00
jsteemann d72762cbdd fix default ssl protocol in yet another place 2017-04-21 18:07:40 +02:00
jsteemann 1df46f8923 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 16:59:32 +02:00
Kaveh Vahedipour d5a8269d57 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-21 15:47:09 +02:00
Kaveh Vahedipour 1f81ce28b0 merge in cpp & js from 3.1.18 yet to do tests 2017-04-21 15:41:05 +02:00
jsteemann 361d513087 re-enable user settings for RocksDB 2017-04-21 15:28:29 +02:00
baslr e275112601 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-21 15:20:39 +02:00
jsteemann 62d0bb36d1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 15:17:43 +02:00
Wilfried Goesgens cb54938582 also try to detect the icu database in its absolute install directory 2017-04-21 14:22:56 +02:00
jsteemann 9d6277689c change default value for `--ssl.protocol` from 4 (TLSv1) to 5 (TLSv12) 2017-04-21 12:49:16 +02:00
jsteemann d489934df2 remove unused include 2017-04-21 10:27:11 +02:00
Simon Grätzer b304d35ac2 Added rocksdb background thread 2017-04-20 18:50:52 +02:00
baslr 9d6d781425 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-20 15:58:08 +02:00
jsteemann 87d18664f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 12:26:13 +02:00
Frank Celler 6b37aacfa0 remove old files on startup 2017-04-20 11:42:48 +02:00
jsteemann fd333875a2 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-20 09:05:23 +02:00