jsteemann
|
e358c38784
|
make ctor explicit, dont copy parameters
|
2017-04-26 16:24:11 +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 |
Frank Celler
|
ab7bcfe224
|
--server.maximal-queue-size is now an absolute maximum
|
2017-04-26 11:20:56 +02:00 |
baslr
|
f45a7f07b1
|
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
|
2017-04-26 10:52:50 +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
|
eda353819a
|
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
|
2017-04-25 12:45:30 +02:00 |
jsteemann
|
9db917bd77
|
try to fix shutdown issue
|
2017-04-25 12:28:51 +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 |
Frank Celler
|
d783d4ecae
|
added queue time and request tracing with timings
|
2017-04-24 18:47:44 +02:00 |
baslr
|
3d9f58bb70
|
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
|
2017-04-24 12:45:35 +02:00 |
Dan Larkin
|
af8e1889a1
|
Moved MMFiles replication handler.
|
2017-04-18 15:35:45 -04:00 |
baslr
|
fef40e3c9d
|
merge with devel
|
2017-03-24 12:07:29 +01:00 |
Frank Celler
|
46b04f1317
|
added message id to debug output
|
2017-03-24 09:57:07 +01:00 |
baslr
|
494a898d04
|
user database permissions from ldap
|
2017-03-23 23:52:37 +01:00 |
baslr
|
71b22e642f
|
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
|
2017-03-23 13:36:12 +01:00 |
jsteemann
|
fbb14ceffc
|
added db._engine()
|
2017-03-22 11:19:31 +01:00 |
baslr
|
9582d6823a
|
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
|
2017-03-22 10:50:38 +01:00 |
jsteemann
|
358e18d5af
|
fix wrong assertions
|
2017-03-22 09:45:02 +01:00 |
Frank Celler
|
a25932293b
|
added assert and only compact if no request is in flight
|
2017-03-22 08:52:37 +01:00 |
baslr
|
8fa6f9c5e7
|
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
|
2017-03-21 23:27:26 +01:00 |
Frank Celler
|
e997b791a8
|
fixed lost HTTP requests
|
2017-03-21 22:51:49 +01:00 |
jsteemann
|
b8e011eee5
|
move attributes into engine
|
2017-03-21 10:31:50 +01:00 |
baslr
|
90341c5efb
|
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
|
2017-03-18 04:14:39 +01:00 |
baslr
|
bc14d53ff5
|
ldap authwork
|
2017-03-18 04:14:15 +01:00 |
jsteemann
|
c46c52d8c8
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into views
|
2017-03-17 09:31:25 +01:00 |
Frank Celler
|
5759414ec1
|
because VST supports pipelining, allows queue the request in the scheduler
|
2017-03-17 09:08:01 +01:00 |
jsteemann
|
2c0f9d9369
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into views
|
2017-03-16 15:47:48 +01:00 |
Max Neunhoeffer
|
d4d532faa4
|
Silence a compiler warning.
|
2017-03-16 14:13:28 +01:00 |
Max Neunhoeffer
|
bbcc20378a
|
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
|
2017-03-16 13:54:02 +01:00 |
Max Neunhoeffer
|
428b6aa67f
|
Port thread fixes from 3.1 to devel.
|
2017-03-16 13:53:40 +01:00 |
jsteemann
|
25a380f77c
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into views
|
2017-03-16 12:50:11 +01:00 |
jsteemann
|
238fcae46a
|
some simplifications
|
2017-03-16 10:54:08 +01:00 |
Dan Larkin
|
966e05b596
|
Added very basic rest handler for views.
|
2017-03-14 19:05:14 -04:00 |
Simon Grätzer
|
7b35f75b23
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
# arangod/CMakeLists.txt
# arangod/GeneralServer/GeneralServerFeature.cpp
|
2017-03-13 12:25:28 +01:00 |
jsteemann
|
45a68f54f8
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
|
2017-03-13 12:10:54 +01:00 |
Simon Grätzer
|
871272d7c1
|
Merge from devel
|
2017-03-12 12:32:22 +01:00 |
jsteemann
|
b217a9d6af
|
remove unused feature
|
2017-03-10 23:59:09 +01:00 |
jsteemann
|
0a07bb3222
|
make RestWalHandler a handler of the MMFiles engine
|
2017-03-10 09:00:37 +01:00 |
Simon Grätzer
|
2c77f42486
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
|
2017-03-07 15:08:06 +01:00 |
jsteemann
|
e495b5fb6c
|
jslint && cppcheck
|
2017-03-06 16:13:04 +01:00 |
jsteemann
|
8ba2654540
|
cleanup
|
2017-03-06 16:08:49 +01:00 |
Simon Grätzer
|
c0a390aefe
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
|
2017-03-06 15:53:43 +01:00 |
jsteemann
|
f7b819579d
|
attempt to fix clang build
|
2017-03-06 15:40:03 +01:00 |
Frank Celler
|
da27597ff4
|
fixed missing double quote
|
2017-03-05 23:29:08 +01:00 |
Simon Grätzer
|
dfd3cc3869
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
# arangosh/Import/ImportHelper.cpp
|
2017-03-04 02:08:27 +01:00 |
Jan Christoph Uhde
|
d4000ebf70
|
Add hexdump when vaidation fails for incoming VPackSlice
|
2017-03-03 22:38:04 +01:00 |
Simon Grätzer
|
27c617fe10
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
# 3rdParty/V8/v8
# arangod/Transaction/Methods.h
# arangod/Utils/UserTransaction.h
# arangod/V8Server/v8-collection.cpp
|
2017-03-01 14:52:35 +01:00 |
jsteemann
|
dc72ec3ee7
|
fixed a race when dropping databases
|
2017-02-23 15:22:50 +01:00 |
Simon Grätzer
|
edab268572
|
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
# arangod/Aql/FunctionDefinitions.cpp
# arangod/Aql/Functions.h
# arangod/Utils/ExplicitTransaction.h
|
2017-02-10 15:21:24 +01:00 |