baslr
f669fd4b9e
LDAP: more options
2017-03-30 11:03:13 +02:00
baslr
984c44e7b0
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-30 10:48:10 +02:00
jsteemann
b2c9a976b3
re-enable AQL tests
2017-03-30 09:00:21 +02:00
baslr
3b2ccf46f4
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-30 01:55:08 +02:00
Dan Larkin
d8f19f3046
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-03-29 12:14:13 -04:00
Dan Larkin
7dcb555b72
Added PATCH support to view rest handler.
2017-03-29 12:13:55 -04:00
Frank Celler
3f0915b436
do not require config for --version
2017-03-29 17:52:36 +02:00
mpv1989
9cfa58d07c
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-29 17:33:23 +02:00
mpv1989
e763233ca7
Foxx: Fix arangoUser not being set correctly
2017-03-29 17:33:16 +02:00
hkernbach
905259a8a1
fixed bundle mac build
2017-03-29 16:55:35 +02:00
mpv1989
bbbf4ea0b9
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-29 15:57:43 +02:00
mpv1989
8fba5f2050
Docs: improved CORS docs
2017-03-29 15:57:33 +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
mpv1989
8809de608d
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-29 13:43:35 +02:00
mpv1989
59e000b743
Foxx: Fix CORS blowing up when headers are not set
2017-03-29 13:43:06 +02:00
hkernbach
2c10fb1d8a
fixed issue: #2397
2017-03-29 12:53:55 +02:00
Wilfried Goesgens
619713c596
fix lock file error handling, improve error messages
2017-03-29 12:22:08 +02:00
Andreas Streichardt
0bf00036c6
Streamline shutdown and start
2017-03-29 11:55:02 +02:00
Simon Grätzer
a86abeae40
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-29 11:35:42 +02:00
Simon Grätzer
901abc6705
Fixing some windows conversion warnings
2017-03-29 11:35:37 +02:00
jsteemann
02aca574f4
turn off ranges test by default
2017-03-29 11:20:12 +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
jsteemann
bf6e3bddbe
fix MSVC warning
2017-03-29 10:11:46 +02:00
jsteemann
e3ca787992
warn before we run out of file descriptors
2017-03-29 02:35:46 +02:00
jsteemann
75daeab31b
updated CHANGELOG
2017-03-29 01:17:03 +02:00
jsteemann
d4752433f0
slightly simplify logging
2017-03-29 01:16:55 +02:00
jsteemann
f8a01fae54
comments
2017-03-29 01:06:47 +02:00
jsteemann
d0766688f3
properly tag geo index tests, and include the long running geo index tests by default
2017-03-29 00:54:24 +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
f6bcfc2380
docs: explain CORS credentials usage
2017-03-28 21:04:07 +02:00
mpv1989
43cb5fc81b
Merge branch 'feature/cors' into devel
2017-03-28 20:37:30 +02:00
mpv1989
335dd44d1a
document CORS changes
2017-03-28 20:34:32 +02:00
mpv1989
f3ebf247b0
automatically add CORS response headers
2017-03-28 19:48:46 +02:00
Wilfried Goesgens
ffc3d6a515
- move runInArangosh over to test-utils, so its right next to runThere.
...
- use runInArangosh for the replication tests, so they show proper result reports.
2017-03-28 19:05:00 +02:00
Wilfried Goesgens
476befc9d0
refactor testing.js
...
- split utility functionality into its own file
- add module loader so we can have modules
- move all testsuites into own files
- remove complicated testcase joining / splitting methods
2017-03-28 16:29:51 +02:00
mpv1989
4b8c880486
added OPTIONS to cors methods header
2017-03-28 16:18:53 +02:00
hkernbach
2b0bd3cd5e
changelog
2017-03-28 14:57:36 +02:00
hkernbach
0a9ed38b6a
ui - bugfix smart graph selection missing
2017-03-28 14:22:45 +02:00
Andreas Streichardt
f32256e5a7
Normalize test resultstructure (hopefully)
2017-03-28 14:15:08 +02:00
Alan Plum
d8d844ae44
git ignore .vscode
...
[skip ci]
2017-03-28 14:12:32 +02:00
baslr
3161fdc6f8
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-28 14:02:16 +02:00
jsteemann
467307fd07
fixed issue #2400
2017-03-28 13:58:49 +02:00
hkernbach
3ad5c6366d
fixed issue: #2389
2017-03-28 11:54:47 +02:00
jsteemann
a5013733a2
force recovery tests to fail when not compiled with failure-tests
2017-03-28 09:47:52 +02:00
jsteemann
a6242fd474
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-28 09:45:57 +02:00
jsteemann
3d0beb3a23
implement SLEEP() in C++
2017-03-28 09:45:53 +02:00