1
0
Fork 0
Commit Graph

37239 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 e63b9b2768 updated CHANGELOG 2017-03-11 02:00:52 +01: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 25a5a9c085 allow "yes" and "no" for boolean parameters 2017-03-11 00:00:16 +01:00
jsteemann bc68406aaf remove useless junk from script 2017-03-10 23:59:53 +01:00
jsteemann b217a9d6af remove unused feature 2017-03-10 23:59:09 +01:00
baslr 1de610735f Merge branch 'devel' into feature/ldap-auth 2017-03-10 17:27:23 +01:00
Frank Celler c4a591abd2 ui - fixed wrong merge of statistics information from different coordinators 2017-03-10 16:43:58 +01:00
Wilfried Goesgens 00bcb07624 exclude rocksdb gtest from the build 2017-03-10 15:31:57 +01:00
Wilfried Goesgens 01524c2ac3 add submodule rocksdb 2017-03-10 14:42:34 +01:00
Wilfried Goesgens 3c6bdccde3 add submodule rocksdb 2017-03-10 14:42:02 +01:00
Wilfried Goesgens 4b41444c0a remove in working copy rocksdb 2017-03-10 14:40:36 +01:00
hkernbach 2f7fd16a63 changelog 2017-03-10 14:16:10 +01:00
hkernbach 5cd6bbaa71 ui - fixed wrong protocol usage within encrypted environment 2017-03-10 14:00:42 +01:00
jsteemann 24e3fffb6c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-10 08:11:21 +01:00
jsteemann 30651604c6 provide more info in supervisor mode 2017-03-10 08:11:09 +01:00
Wilfried Goesgens 2181f34efa Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2017-03-09 17:39:27 +01:00
Wilfried Goesgens f6d9bea41b remove accidential published documentation for the next release 2017-03-09 17:39:14 +01:00
jsteemann 8c4fca5ce5 updated CHANGELOG 2017-03-09 14:29:30 +01:00
jsteemann 9278149b24 fixed --convert 2017-03-09 14:29:23 +01:00
Wilfried Goesgens 9e8daf07c8 Merge branch 'devel' of github.com:arangodb/ArangoDB into devel 2017-03-09 13:27:07 +01:00
Wilfried Goesgens 5058d3f79b our 2 cent on filesystems 2017-03-09 13:26:48 +01:00
jsteemann 0941e14b92 fixed issue #2367 2017-03-09 11:27:59 +01:00
Wilfried Goesgens 8a9a39382a fiddle with cmake ifs 2017-03-08 18:18:32 +01:00
jsteemann 59b973d212 fixed tests 2017-03-08 18:08:36 +01:00
jsteemann 6b882ca8a2 class renaming 2017-03-08 17:54:00 +01:00
jsteemann 3e0969da37 fix memleak 2017-03-08 17:29:15 +01:00
jsteemann 10c480f621 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel 2017-03-08 17:23:39 +01:00
jsteemann f02ebfc07b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel 2017-03-08 17:07:18 +01:00
jsteemann 928060153e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-08 15:07:38 +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
Wilfried Goesgens 5f03c50d8b only set the osx deployment target if its not preset 2017-03-08 14:55:19 +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
Frank Celler 6672ff40da fix for old test implementations 2017-03-08 13:07:30 +01:00
Frank Celler 25aafce6be fixed wrong message level 2017-03-08 13:01:20 +01:00
Frank Celler 7eefdf547b simplification: FileResult does only support ok, no additional result
header only, added FileResultString class for Result that return a string
2017-03-08 13:01:20 +01:00
jsteemann fd7ad33a0c added -Wnon-virtual-dtor compile option 2017-03-08 12:56:58 +01:00
jsteemann ebe3a34678 remove version number from readme 2017-03-08 11:52:59 +01:00
Andreas Streichardt 95f9d1e191 Remove fakeit for now 2017-03-08 11:33:42 +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