1
0
Fork 0
Commit Graph

1928 Commits

Author SHA1 Message Date
jsteemann b848030818 enable rocksdb logger 2017-05-12 12:03:54 +02:00
Simon Grätzer c21bd1eeb8 Rocksb: index locking issue 2017-05-11 15:12:05 +02:00
Simon Grätzer f101e21328 Geo index update, renaming 2017-05-11 13:19:51 +02:00
jsteemann 6a12272673 cppcheck 2017-05-10 18:24:34 +02:00
Simon Grätzer d8053a9bcf Fixing fulltext deduplication 2017-05-10 16:17:46 +02:00
jsteemann 488e4be485 preparation for RocksDB logger 2017-05-09 12:42:25 +02:00
jsteemann 1bfc52d800 suppress non-error warnings on shutdown 2017-05-09 12:40:45 +02:00
jsteemann 51b5dbbe57 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-09 10:25:53 +02:00
jsteemann 217d41f6f5 fix shutdown races 2017-05-09 10:24:40 +02:00
jsteemann 7db04133dd move RocksDBLogger code into cpp file 2017-05-08 23:53:04 +02:00
Andreas Streichardt 6ffd2f6da2 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-08 20:33:20 +02:00
jsteemann 7577fed6fb added logger 2017-05-08 18:24:40 +02:00
jsteemann 37a6dd2a81 remove unnecessary includes 2017-05-08 15:59:33 +02:00
jsteemann 5e5aa50bb7 remove obsolete comment 2017-05-08 15:57:20 +02:00
jsteemann d47a506bcc slightly improve error messages 2017-05-04 23:17:26 +02:00
Andreas Streichardt f72b0eac05 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-05-03 23:32:02 +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 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
Frank Celler 33fda9275c Merge pull request #2451 from arangodb/feature/ldap-auth
Feature/ldap auth
2017-04-26 14:12:32 +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
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 1df46f8923 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-21 16:59:32 +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 c5854d050b fix shutdown issue, modernize thread creation a bit 2017-04-19 16:57:53 +02:00
baslr 42ad1a8480 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-19 16:08:14 +02:00
jsteemann bda09ab9bd Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 08:34:57 +02:00
jsteemann 5f8d9c4eb8 attempt to fix synchronization 2017-04-18 15:33:56 +02:00
Michael Hackstein 1087065ea5 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
baslr d4ae94f937 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-10 17:14:37 +02:00
Jan Christoph Uhde c82fadc863 prepare limitation of transaction size 2017-04-10 14:00:55 +02:00
Frank Celler 50cfd9883e added missing nullptr check 2017-04-10 09:23:30 +02:00