Kaveh Vahedipour
c51e144678
ASAN runtime errors
2017-04-28 11:57:20 +02:00
jsteemann
8d5248932b
lock unification
2017-04-28 09:12:31 +02:00
Jan Christoph Uhde
5fa2cffc63
fix warning
2017-04-27 15:51:19 +02:00
Jan Christoph Uhde
837763097a
fix windows warning
2017-04-27 15:12:30 +02:00
jsteemann
8b7fe79ebb
added isLocked() flag for ConditionLocker
2017-04-27 13:01:30 +02:00
Simon Grätzer
fa15b43088
Fixed typedefs
2017-04-26 19:27:11 +02:00
Simon Grätzer
29286a9c1b
RocksDB WAL entries for transactions
2017-04-26 18:54:55 +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
Simon Grätzer
d228a94462
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
# Conflicts:
# arangod/Replication/InitialSyncer.cpp
2017-04-26 11:06:09 +02:00
baslr
f45a7f07b1
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-26 10:52:50 +02:00
jsteemann
4289105eb3
fix shutdown issue
2017-04-25 16:09:01 +02:00
jsteemann
7344a03623
fix crashes
2017-04-25 15:47:11 +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
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
baslr
9a78fc650b
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-24 15:37:18 +02:00
Kaveh Vahedipour
c9c4f6ccef
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-24 15:13:52 +02:00
Kaveh Vahedipour
ccc388a940
more dictributeShardsLike code mergedfrom 3.1
2017-04-24 15:13:40 +02:00
Wilfried Goesgens
ea3075e817
comment out the windows unhandled exception handler
2017-04-24 15:13:40 +02:00
Kaveh Vahedipour
c099c6daa9
more dictributeShardsLike code mergedfrom 3.1
2017-04-24 15:12:38 +02:00
baslr
3d9f58bb70
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-24 12:45:35 +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
1f81ce28b0
merge in cpp & js from 3.1.18 yet to do tests
2017-04-21 15:41:05 +02:00
jsteemann
c5854d050b
fix shutdown issue, modernize thread creation a bit
2017-04-19 16:57:53 +02:00
baslr
42ad1a8480
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-19 16:08:14 +02:00
jsteemann
bda09ab9bd
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-04-19 08:34:57 +02:00
jsteemann
5f8d9c4eb8
attempt to fix synchronization
2017-04-18 15:33:56 +02:00
Michael Hackstein
1087065ea5
Merge branch 'devel' of github.com:arangodb/arangodb into engine-api
2017-04-13 17:34:25 +02:00
baslr
d4ae94f937
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-10 17:14:37 +02:00
Jan Christoph Uhde
c82fadc863
prepare limitation of transaction size
2017-04-10 14:00:55 +02:00
Frank Celler
50cfd9883e
added missing nullptr check
2017-04-10 09:23:30 +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
Jan Christoph Uhde
60956dc09c
fix windows build
2017-04-06 10:17:17 +02:00
Michael Hackstein
039c6fbd16
Moved all logic of lib/Basics/PathFinder into seperated files in arangod/Graph. Preparation to detemplatify this code as we need some arangodb interna in it for Slice mangement
2017-04-05 15:31:44 +02:00
jsteemann
9f330881a2
constify method
2017-04-05 09:00:06 +02:00
jsteemann
e0ec315d38
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-04-03 13:20:02 +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
Jan Christoph Uhde
95007fe28e
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api-arango-result
...
* 'engine-api' of https://github.com/arangodb/arangodb : (46 commits)
Merged RocksDBPathBasedIndex into RocksDBVPackIndex.
fix handling of externals
fix toArray()
fix returning documents
Added hash-, skip list, persistent indexes
harmonize filtering - filter on full filename.
mini modifications
standardize starting of servers for replication tests
Edge index compliant with design doc
another fix for #2404
Moved „removeLargeRange“ method to commons
Added length byte to IndexValue keys.
fixed issue #2404
Added drop to primary index
Added drop() to indexes
Fixes a coordinator crash in Clustered Traversal. In case of failover during query planning.
Fixed edge index
Expand on CORS documentation
Let ArangoDB handle the allow-credentials header
make the authentication tests run on directories
...
2017-03-30 19:46:17 +02:00
Jan Christoph Uhde
13d83da06f
improve arangodb::Result
2017-03-30 14:58:58 +02:00
baslr
f669fd4b9e
LDAP: more options
2017-03-30 11:03:13 +02:00
Jan Christoph Uhde
b83ae2ab82
refactor some code to make use of arangodb::Result
2017-03-30 09:39:21 +02:00
jsteemann
3ff4f15a19
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-29 17:50:55 +02:00
jsteemann
e73417aef1
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
2017-03-29 17:50:49 +02:00
Simon Grätzer
cd9e9a13cf
Path based enumerator
2017-03-29 17:33:02 +02:00
baslr
352ad60589
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-29 15:56:56 +02:00
jsteemann
2a6eade215
added LDAP url parser
2017-03-29 15:34:49 +02:00
baslr
0713099acc
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-29 15:13:24 +02:00
jsteemann
bd4a2eb6b6
make @dothebart happier
2017-03-29 15:04:54 +02:00
jsteemann
f04f6e7cd4
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-29 12:53:26 +02:00
Jan Christoph Uhde
408d7cab12
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
...
* 'engine-api' of https://github.com/arangodb/arangodb :
fixed serialization bug
warn before we run out of file descriptors
updated CHANGELOG
slightly simplify logging
2017-03-29 11:22:18 +02:00
jsteemann
d99945e962
use ReadWriteLockCPP11 instead of ReadWriteLock
...
ReadWriteLock is now a typedef for ReadWriteLockCPP11
one of the classes will finally be removed when it is known which locking concept is superior
2017-03-29 11:13:50 +02:00
Jan Christoph Uhde
796c32a341
improve error handling in some places
2017-03-29 11:04:04 +02:00
jsteemann
bf6e3bddbe
fix MSVC warning
2017-03-29 10:11:46 +02:00
jsteemann
383239a14f
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-29 09:17:44 +02:00
jsteemann
f728fcdbb8
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-29 02:41:00 +02:00
jsteemann
e3ca787992
warn before we run out of file descriptors
2017-03-29 02:35:46 +02:00
jsteemann
f8a01fae54
comments
2017-03-29 01:06:47 +02:00
baslr
7f92c26774
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-29 00:29:16 +02:00
jsteemann
e1aef394d8
delete useless DEV_TIMERS, fix rwlockcpp11
2017-03-28 22:38:27 +02:00
mpv1989
4b8c880486
added OPTIONS to cors methods header
2017-03-28 16:18:53 +02:00
Simon Grätzer
1a50029592
Edge Index work
2017-03-28 00:55:59 +02:00
Dan Larkin
fcb3c2f91e
Added method to convert RocksDB Status to ArangoDB Result.
2017-03-24 13:19:34 -04:00
jsteemann
2aa2fd65a4
more startup
2017-03-24 14:20:51 +01:00
baslr
fef40e3c9d
merge with devel
2017-03-24 12:07:29 +01:00
baslr
e78da3d85f
LDAP: added additional errors
2017-03-23 23:51:48 +01:00
jsteemann
2eeccd5f09
small simplifications for error handling
2017-03-23 21:18:53 +01:00
jsteemann
02c0dcc689
properly report error locations
2017-03-23 20:18:33 +01:00
jsteemann
b87cc95038
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-23 19:42:10 +01:00
jsteemann
8e4e463239
don't call throwing functions in dtor
2017-03-23 19:40:13 +01:00
jsteemann
45da5ffe9c
more diagnostic output for "not implemented"
2017-03-23 14:10:00 +01:00
baslr
8c2b951884
LDAP: additional error codes
2017-03-23 01:26:51 +01:00
baslr
f593561438
introduce LDAP errors
2017-03-20 16:14:29 +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
fa26d8ca6c
this time fix the leak properly
2017-03-17 14:45:55 +01:00
jsteemann
650d1afad5
fix leaks during cleanup
2017-03-17 13:38:23 +01:00
jsteemann
e3d8ae142e
some fixes for view handling
2017-03-17 11:18:46 +01:00
jsteemann
67c1770f3e
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-17 09:29:03 +01:00
jsteemann
8a69f5716f
show collection load time in slow queries
2017-03-17 09:28:53 +01:00
Simon Grätzer
3f29cf356b
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-16 17:03:45 +01:00
Simon Grätzer
70401fe5db
Fixed JS_KillExternal
2017-03-16 17:03:29 +01:00
jsteemann
a87b8c4f25
generalize usleep argument
2017-03-16 16:27:40 +01:00
Simon Grätzer
876bbb98f9
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-13 23:27:11 +01:00
jsteemann
894a558367
try to un-mess windows build
2017-03-13 17:28:46 +01: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
94e1a92f6f
added comment
2017-03-09 16:32:27 +01:00
jsteemann
537757d9a3
added EnumIterator
2017-03-08 23:40:57 +01:00
Simon Grätzer
67066c64ad
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-08 18:20:44 +01:00
jsteemann
3e0969da37
fix memleak
2017-03-08 17:29:15 +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
Simon Grätzer
2c77f42486
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-07 15:08:06 +01:00
Wilfried Goesgens
a7e154b27e
improve error messages when trying to create indices
2017-03-06 19:10:46 +01:00
jsteemann
d55e60cb2e
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-06 17:17:02 +01:00
jsteemann
f6414b38ba
fixed constructors
2017-03-06 17:14:22 +01:00
jsteemann
39370aac2f
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-06 17:04:35 +01:00
Frank Celler
b14dbe6435
added base class Result and an example FileResult
2017-03-06 10:33:32 -05:00
jsteemann
e27cf1bc5e
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-03-06 15:55:00 +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