jsteemann
3c4393636a
fixed foxx test
2017-04-24 23:52:28 +02:00
jsteemann
fe1268af97
added missing return
2017-04-24 23:30:57 +02:00
baslr
28461a24ca
js request simplified if sslProtocol
2017-04-24 23:06:46 +02:00
baslr
e01abcf1ed
pass also sslProtocol from request to internal.download
2017-04-24 23:06:45 +02:00
jsteemann
4d6c21f3c5
fixed issue #2450
2017-04-24 23:06:45 +02:00
jsteemann
d1cad2acc9
cppcheck
...
fix
2017-04-24 23:06:36 +02:00
Dan Larkin
0ce293bb6a
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-04-24 16:36:53 -04:00
Dan Larkin
a17de4e296
Added a missing switch break.
2017-04-24 16:36:50 -04:00
jsteemann
9cdf52c6e9
remove dead code
2017-04-24 21:42:13 +02:00
Jan Christoph Uhde
5c59255c5f
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
* 'devel' of https://github.com/arangodb/arangodb :
Fixed unnecessary move of temporary object
fix license / readme filenames
two ways to name snap packages?
Fixed TraversalCounting in cluster again. Was removed by accident from totally unrelated commit
avoid warnings for time being
fixed exterprise build in devel
2017-04-24 19:01:42 +02:00
Jan Christoph Uhde
37db67dee5
fix engine name
2017-04-24 19:01:31 +02:00
Frank Celler
53e5da6643
updated CHANGELOG
2017-04-24 19:01:12 +02:00
Frank Celler
856f8c9df3
raised to 4
2017-04-24 18:59:02 +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
45690bbbdd
fixed queue size
2017-04-24 18:47:44 +02:00
Frank Celler
1a4675dfbf
added queue size to statistics
2017-04-24 18:47:44 +02:00
Frank Celler
d783d4ecae
added queue time and request tracing with timings
2017-04-24 18:47:44 +02:00
Michael Hackstein
dd90398dfe
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-04-24 18:31:25 +02:00
Michael Hackstein
bce4b9ef5d
Fixed unnecessary move of temporary object
2017-04-24 18:31:18 +02:00
Jan Christoph Uhde
59ca7abe21
fix JS_StateLoggerReplication -- engine specific code should go into engines
2017-04-24 17:40:50 +02:00
Wilfried Goesgens
34f04a56e2
fix license / readme filenames
2017-04-24 17:32:59 +02:00
Wilfried Goesgens
e1b97a2d24
two ways to name snap packages?
2017-04-24 17:02:17 +02:00
Michael Hackstein
8596cec20b
Fixed TraversalCounting in cluster again. Was removed by accident from totally unrelated commit
2017-04-24 16:58:21 +02:00
Kaveh Vahedipour
262bb4faac
avoid warnings for time being
2017-04-24 16:49:26 +02:00
Kaveh Vahedipour
a514649132
fixed exterprise build in devel
2017-04-24 16:33:53 +02:00
Simon Grätzer
0b2525664a
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-24 15:55:26 +02:00
Simon Grätzer
91fe0f01ea
formatting
2017-04-24 15:55:21 +02:00
Wilfried Goesgens
72f1fd5792
use glob
2017-04-24 15:51:30 +02:00
Simon Grätzer
fe84b499c0
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel
2017-04-24 15:45:39 +02:00
Simon Grätzer
b5612c3585
Merge branches 'engine-api' and 'engine-api' of https://github.com/arangodb/arangodb into engine-api
2017-04-24 15:40:53 +02:00
Simon Grätzer
7176d34169
Fixed incremental synced
2017-04-24 15:40:48 +02:00
Michael Hackstein
adf86751f1
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-04-24 15:38:02 +02:00
Michael Hackstein
13b7bf5744
Fixed replication tests. They tried to drop system collections without FORCE => setup failures if the collection exists before.
2017-04-24 15:37:52 +02:00
baslr
9a78fc650b
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-24 15:37:18 +02:00
Kaveh Vahedipour
a823a437b1
correct rocksdb cluster start
2017-04-24 15:34:07 +02:00
Kaveh Vahedipour
e9c1659f74
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-24 15:32:24 +02:00
Kaveh Vahedipour
e559ca63f9
unable to start rocksdb cluster right now
2017-04-24 15:32:16 +02:00
Jan Christoph Uhde
6b688c75f1
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
* 'devel' of https://github.com/arangodb/arangodb :
comment out the windows unhandled exception handler
more dictributeShardsLike code mergedfrom 3.1
2017-04-24 15:30:15 +02:00
Jan Christoph Uhde
a21fc6fd7c
fix engine type filtering for replication tests
2017-04-24 15:29:22 +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
ef75c2ac02
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-04-24 15:10:42 +02:00
Jan Christoph Uhde
40b80b64e3
Merge branch 'engine-api' into devel
...
* engine-api:
remove mmfiles specific test code for other engines
2017-04-24 15:02:07 +02:00
Jan Christoph Uhde
64ccf864a4
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
...
* 'engine-api' of https://github.com/arangodb/arangodb :
Adapted statistics in tests for SinlgeServer Traversal.
Fixed JSLint
2017-04-24 15:01:26 +02:00
Jan Christoph Uhde
dd3253a935
remove mmfiles specific test code for other engines
2017-04-24 15:00:21 +02:00
baslr
21eb717c44
ldap documentation
2017-04-24 14:56:52 +02:00
jsteemann
af9a214c9f
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-04-24 14:23:54 +02:00
jsteemann
b7bf8a8983
implement basic operations for settings
2017-04-24 14:19:29 +02:00