1
0
Fork 0
Commit Graph

13059 Commits

Author SHA1 Message Date
baslr a06c159081 fix unintended newline 2017-03-13 10:26:47 +01:00
baslr 4ec57d784d merge from devel 2017-03-13 01:06:17 +01:00
baslr 05e708138b ldap auth 2017-03-13 00:49:57 +01:00
Dan Larkin 06c3668915 Fixed a compile bug. 2017-03-11 13:22:07 -05:00
Dan Larkin 6a449efb06 Improved cache rebalancing and allocation strategies. 2017-03-11 12:15:08 -05:00
jsteemann b662b6edbf added missing locks to authentication cache methods 2017-03-11 01:54:37 +01:00
jsteemann 8875243c66 some minor refactoring preparations 2017-03-11 01:14:55 +01:00
jsteemann 2e1c7fcea6 some minor refactoring preparations 2017-03-11 01:01:29 +01:00
jsteemann b217a9d6af remove unused feature 2017-03-10 23:59:09 +01:00
jsteemann 6b882ca8a2 class renaming 2017-03-08 17:54:00 +01:00
jsteemann a2a29ab6b1 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-08 15:07:33 +01:00
jsteemann 3ed19e291d added "shardIds" option for AQL queries to restrict queries to specific shards 2017-03-08 15:07:10 +01:00
Michael Hackstein 489f0d12b8 Moved the decision to write a marker into the databaseFeature, it is not triggered from outside any more. Furthermore renameCollection write marker is now done in MMFiles. 2017-03-08 14:54:25 +01:00
Michael Hackstein 18700387a8 Drop / Create Database in DBFeature does not expose writeMarker flag in it's API 2017-03-08 13:27:01 +01:00
Michael Hackstein 4701a40867 Cleanup LogicalCollection.h 2017-03-08 13:26:20 +01:00
Michael Hackstein f7210ee75b Fixed forward declaration. Was declared as class but is a struct 2017-03-08 13:25:37 +01:00
Michael Hackstein 636cc097b0 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-08 11:03:51 +01:00
Michael Hackstein 580d2a4336 Moved indexes down into the physical collections 2017-03-08 11:03:45 +01:00
Michael Hackstein e6ab0afb50 Moved indexBuckets from Logical => MMFiles collection. 2017-03-07 14:07:32 +01:00
jsteemann 57dd92902c move engine-specific optimizer rules into engine 2017-03-07 13:10:58 +01:00
jsteemann 63918afce9 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-07 00:19:39 +01:00
jsteemann 644ef08ce0 added "bindVars" to attributes of currently running and slow queries 2017-03-07 00:19:01 +01:00
Andreas Streichardt 59b49485b5 Merge branch 'devel' into catch_tests_ng 2017-03-06 18:34:46 +01:00
jsteemann aa8160fc3d try to fix non-enterprise compile error 2017-03-06 18:09:43 +01:00
Andreas Streichardt ce3c17e7de Merge branch 'devel' into catch_tests_ng 2017-03-06 17:59:26 +01:00
Michael Hackstein 9b69035f1a Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 17:40:46 +01:00
Michael Hackstein 31df7eb527 Fixed error in recovery for duplicate collection name 2017-03-06 17:34:54 +01:00
jsteemann 39370aac2f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 17:04:35 +01:00
jsteemann c2a41cb5a2 remove references to MMFiles* 2017-03-06 17:04:23 +01:00
Dan Larkin db2cabf844 Completed implementation of transactional cache. 2017-03-06 10:31:36 -05:00
jsteemann e495b5fb6c jslint && cppcheck 2017-03-06 16:13:04 +01:00
jsteemann 9d3bbd1d89 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 16:08:58 +01:00
jsteemann 8ba2654540 cleanup 2017-03-06 16:08:49 +01:00
Michael Hackstein 42e14c59f4 A MMFiles collection now reads a path if created from a slice. 2017-03-06 16:06:23 +01:00
Michael Hackstein d4dd243946 Alphabetically ordered includeds 2017-03-06 16:04:43 +01:00
jsteemann e27cf1bc5e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 15:55:00 +01:00
Michael Hackstein dccd6d5c1d Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-03-06 15:40:36 +01:00
jsteemann f7b819579d attempt to fix clang build 2017-03-06 15:40:03 +01:00
Michael Hackstein 13a1f15116 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 15:26:46 +01:00
jsteemann 62eee2d9bf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 14:31:36 +01:00
jsteemann c7acebe3c0 Revert "another attempt to fix logger issues"
This reverts commit c6c9120e33.
2017-03-06 14:30:42 +01:00
jsteemann 79f6a39c23 fix cppcheck errors 2017-03-06 14:22:03 +01:00
jsteemann c6c9120e33 another attempt to fix logger issues 2017-03-06 14:20:45 +01:00
Michael Hackstein 048bdf4cbd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 13:28:07 +01:00
jsteemann 19830d8dee Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 12:58:22 +01:00
Mark bf8f0b7be8 fixed windows compile error 2017-03-06 12:24:20 +01:00
Michael Hackstein 7afccbd6e9 Fixed forward declarition. Struct vs. class 2017-03-06 10:48:37 +01:00
jsteemann 9954b52f34 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 08:19:24 +01:00
Frank Celler da27597ff4 fixed missing double quote 2017-03-05 23:29:08 +01:00
Jan Christoph Uhde 664acb8695 Change link order of static libs 2017-03-05 18:54:46 +01:00