1
0
Fork 0
Commit Graph

4769 Commits

Author SHA1 Message Date
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
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
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
Frank Celler 1e03d3cf5a added GiB and co, change GB and co to base 10 2017-04-20 08:26:01 +02:00
Frank Celler f1d0c5eba1 added jemalloc feature 2017-04-19 19:57:54 +02:00
Frank Celler 7d07a0d0da allow KB, MB, GB suffix 2017-04-19 19:57:54 +02:00
Frank Celler b3dd3a4b4a added PID for process id 2017-04-19 19:57:54 +02:00
Frank Celler 55821612ad removed unsupported TCMALLOC 2017-04-19 19:57:54 +02:00
jsteemann 6786f7257e formatting 2017-04-19 17:26:12 +02:00
jsteemann 2ee97ca38f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 17:14:25 +02:00
jsteemann c5854d050b fix shutdown issue, modernize thread creation a bit 2017-04-19 16:57:53 +02:00
baslr 55643cf5ff fixed memory allocation which resulted in an out of bounds read 2017-04-19 15:36:32 +02:00
Jan Christoph Uhde b66c8526c2 change --rocksdb.enabled to be a obosolete option 2017-04-19 14:54:10 +02:00
Jan Christoph Uhde 507b870ff1 add RocksDBOptionFeature to unify configuration of RocksDB
instances for storage-engine and persistent-index that are used mutual
exclusive.
2017-04-19 12:20:41 +02:00
jsteemann 3389337f3a Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 09:02:58 +02:00
jsteemann 05ba201f3e fixed logger 2017-04-19 08:56:02 +02:00
jsteemann bda09ab9bd Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-19 08:34:57 +02:00
hkernbach 945c90426b changed log topic label 2017-04-19 08:25:47 +02:00
jsteemann 5f8d9c4eb8 attempt to fix synchronization 2017-04-18 15:33:56 +02:00
jsteemann 2cf48d1709 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-18 11:33:16 +02:00
jsteemann 24bfb599c4 fixed issue #2429 2017-04-18 10:04:08 +02:00
jsteemann a2705d3e82 fixed issue #2428 2017-04-18 09:30:49 +02:00
Michael Hackstein 1087065ea5 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-04-13 17:34:25 +02:00
Simon Grätzer 14f260f1f0 Upload rockst start script 2017-04-13 14:01:00 +02:00
Simon Grätzer 3b3ee5f996 Counter fixes 2017-04-12 17:10:35 +02:00
Simon Grätzer d9510eee0b Fixing count 2017-04-12 15:22:18 +02:00
baslr f4039fa97d Merge remote-tracking branch 'origin/devel' into devel 2017-04-10 15:10:36 +02:00
baslr 21d3056925 fixed another redirection issue 2017-04-10 15:10:16 +02:00
Jan Christoph Uhde c82fadc863 prepare limitation of transaction size 2017-04-10 14:00:55 +02:00
Wilfried Goesgens dd2b2b3cce add more state logging to the supervisor 2017-04-10 11:22:07 +02:00
Frank Celler 50cfd9883e added missing nullptr check 2017-04-10 09:23:30 +02:00
baslr ebd0d012b4 fixed redirection issue 2017-04-07 18:20:46 +02:00
baslr 80ac3b42e7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-04-07 17:29:55 +02:00
baslr 7c96e02e90 fixed issue #1974 2017-04-07 17:29:34 +02:00
Wilfried Goesgens cfa5daec8f port setenv call for windows 2017-04-07 16:43:26 +02:00
Wilfried Goesgens 331ff7b724 once we found icudtl.dat save its location to the env, so subsequent processes can use that. 2017-04-07 16:06:07 +02:00
Wilfried Goesgens 6ab23bd56d better detect cygwin i/o 2017-04-07 14:00:35 +02:00
Wilfried Goesgens 2da0e41466 add detection for cygwin/ssh ttys 2017-04-06 18:57:19 +02:00