1
0
Fork 0
Commit Graph

39481 Commits

Author SHA1 Message Date
jsteemann c4ecfbf089 fix RemoveLargeRange 2017-04-03 15:44:30 +02:00
jsteemann 9f76a3adde Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 15:26:44 +02:00
jsteemann f162fb2a0f fix ub 2017-04-03 15:26:38 +02:00
jsteemann 72f1790057 fix assertion failure at shutdown 2017-04-03 15:21:43 +02:00
Simon Grätzer 6e13639ca0 Remove provisional code 2017-04-03 15:20:17 +02:00
Simon Grätzer 240173ef4c Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 15:16:19 +02:00
Simon Grätzer 664f45d029 Fixed counter 2017-04-03 15:16:14 +02:00
jsteemann a0cca4d295 remove usleeps 2017-04-03 15:15:51 +02:00
jsteemann 0c1ef188ea Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 15:11:50 +02:00
Simon Grätzer 64101eebec Fixed deadlock 2017-04-03 15:00:37 +02:00
Wilfried Goesgens a7a70b20cf remove old unused foxxqueues testsuite 2017-04-03 14:55:41 +02:00
Simon Grätzer bc36c56716 Fixed broken merge 2017-04-03 14:52:12 +02:00
jsteemann b0d500b19a fail @jsteemann 2017-04-03 14:48:38 +02:00
Wilfried Goesgens 2e52356380 Fix startupsequence, so that jslint doesn't ask for serverpasswords anymore. 2017-04-03 14:38:27 +02:00
baslr 6250e9bfd5 LDAP: documentation 2017-04-03 14:31:48 +02:00
Simon Grätzer d10ebac338 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
# Conflicts:
#	arangod/RocksDBEngine/RocksDBEngine.cpp
2017-04-03 14:26:14 +02:00
Simon Grätzer 7afcac9ed7 Fixing some issues 2017-04-03 14:24:58 +02:00
jsteemann 51e4e6fb99 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-04-03 14:22:36 +02:00
jsteemann 8e13009393 fix invalid assertion 2017-04-03 14:22:21 +02:00
jsteemann 8a4593a7da fix invalid assertion 2017-04-03 14:22:00 +02:00
jsteemann 4c241769f6 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 14:18:04 +02:00
mpv1989 ef1e44ea1e added p/ to gitignore 2017-04-03 14:02:14 +02:00
baslr d68f86b4c6 LDAP: documentation 2017-04-03 13:40:35 +02:00
jsteemann 3f33bc03e2 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 13:39:31 +02:00
Jan Christoph Uhde ec1fbb29fd now drop elements for indexes as well 2017-04-03 13:32:17 +02:00
Simon Grätzer c46db78904 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
# Conflicts:
#	arangod/RocksDBEngine/RocksDBCommon.h
#	arangod/RocksDBEngine/RocksDBEngine.cpp
2017-04-03 13:27:04 +02:00
Simon Grätzer cf4294c9ca Integrated counters with collections 2017-04-03 13:24:22 +02:00
jsteemann e0ec315d38 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 13:20:02 +02:00
Wilfried Goesgens 530ef8c804 properly include the javascript enterprise folders into the test tarballs 2017-04-03 13:19:56 +02:00
jsteemann b4f7ebdb2b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 13:19:55 +02:00
Michael Hackstein 83e42cf6aa Added a destructor for RocksDB indxes that destroys the cache in the manager. Otherwise we end up with too many caches. 2017-04-03 13:16:38 +02:00
Michael Hackstein 4a4b46f66b Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-04-03 13:15:56 +02:00
baslr d18428561d Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-03 13:12:50 +02:00
jsteemann dd9ea4b781 fix parsing for URLs starting with ldap:// 2017-04-03 13:06:31 +02:00
Michael Hackstein 2f29228d3c AqlFeature will now start after cache-manager. 2017-04-03 13:01:38 +02:00
jsteemann 0fcfb4f64d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 12:53:06 +02:00
baslr 15e73f63c2 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-03 12:22:17 +02:00
baslr 5b1433c7b2 LDAP: documentation 2017-04-03 12:22:02 +02:00
Wilfried Goesgens b117a82382 fix filter for replication testcases 2017-04-03 11:58:52 +02:00
Jan Christoph Uhde e49024f16e add drop collection to rocksdb engine 2017-04-03 10:41:02 +02:00
Simon Grätzer 805314274e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 09:23:41 +02:00
Simon Grätzer 01036b65d9 Added counter manager 2017-04-03 09:23:35 +02:00
baslr 6f45b324b1 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-04-02 16:41:52 +02:00
Frank Celler 4607299034 updated licenses, added generator 2017-04-02 15:19:33 +02:00
Frank Celler 27810f128c removed jshint completely 2017-04-02 10:15:53 +02:00
Dan Larkin 23038fdc3b Fixed uniqueness checking in primary index. 2017-03-31 18:03:50 -04:00
Dan Larkin f30f4bdb47 Implemented views methods. 2017-03-31 17:09:27 -04:00
Dan Larkin 631b4e93e0 Honored limit in RocksDBVPackIndex iterator. 2017-03-31 11:10:32 -04:00
jsteemann 90121b69fd honor limit in iterators 2017-03-31 17:05:45 +02:00
Jan Christoph Uhde 46cfae8a7e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  comment out log spam
  added comments
  fix cross book links
2017-03-31 15:45:43 +02:00