1
0
Fork 0
Commit Graph

28771 Commits

Author SHA1 Message Date
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
jsteemann a5bbb8d084 allow using a few more bytes for indexed slice values 2016-04-19 23:34:39 +02:00
jsteemann 7cf218f3e9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 22:32:09 +02:00
jsteemann 316a1bd190 starting support for Externals 2016-04-19 22:31:40 +02:00
jsteemann a3b154043e removed unused typedef 2016-04-19 22:31:12 +02:00
Alan Plum 69b5442181
Rebuild aardvark 2016-04-19 20:18:24 +02:00
Alan Plum 2094d1adca
Unbreaky dashboard floats 2016-04-19 20:17:34 +02:00
Alan Plum 2d44ff2839
Patch Swagger-UI to fix param.type undefined error
See https://github.com/swagger-api/swagger-ui/issues/2004
2016-04-19 18:39:22 +02:00
Jan Steemann 76fa336a3b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:19:21 +02:00
Jan Steemann 34923ff236 added "enabled" flag for statistics output 2016-04-19 18:19:07 +02:00
Alan Plum 494d5d5855
Foxx.getExports -> legacy 2016-04-19 18:16:18 +02:00
Alan Plum 17854b57a8
Formatting 2016-04-19 18:16:18 +02:00
Alan Plum 7b76519bbe
Allow res.throw(status, args) 2016-04-19 18:16:18 +02:00
Alan Plum 8a114a58d3
queues.js -> queues/index.js 2016-04-19 18:16:18 +02:00
Jan Steemann c091031ec7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 18:12:06 +02:00
Jan Steemann 54df0ecb5b fixed statistics 2016-04-19 18:11:55 +02:00
Andreas Streichardt f7a0b10a69 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 18:11:35 +02:00
Andreas Streichardt 95a6540c2e Fix core dump windows stuff 2016-04-19 18:11:18 +02:00
hkernbach 75df0f56f7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 18:02:08 +02:00
hkernbach 96d2348199 frontend, views, navbar 2016-04-19 18:01:31 +02:00
Andreas Streichardt c2914ae521 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 17:41:49 +02:00
Andreas Streichardt 1743f2eb49 num v8 context 1 in agency to save memory 2016-04-19 17:41:24 +02:00
Andreas Streichardt c738773f22 Include guards instead of #pragma once 2016-04-19 17:40:51 +02:00
Michael Hackstein 95662103f2 Fixed JSLint 2016-04-19 17:39:58 +02:00
Michael Hackstein 1eb1e0ee0c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 17:08:21 +02:00
Michael Hackstein 7455347263 Start Local cluster will now fail if upgrading and bootstrapping fails 2016-04-19 17:08:16 +02:00
Michael Hackstein 2c246c860c Fixed a bug in general-graph module. It was possible to create a graph using document collections for relations. This did lead into undefined behaviour. 2016-04-19 17:07:18 +02:00
Jan Steemann 83974b36fa Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 16:57:52 +02:00
Jan Steemann b4e876e282 prefer explicit options over positional argument 2016-04-19 16:57:26 +02:00
Andreas Streichardt f41d9c41c4 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 16:50:36 +02:00
Andreas Streichardt 30b71d0423 Wait 5ms when connection needs to be reestablished 2016-04-19 16:49:51 +02:00
Jan Steemann 0088fa2cbb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 16:38:55 +02:00
Jan Steemann bc7d45aada fixed crash 2016-04-19 16:38:50 +02:00
hkernbach 3d94293e3c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 16:33:28 +02:00
hkernbach bcbaa7bc72 modified nodes view 2016-04-19 16:33:17 +02:00
Alan Plum 8373c04c1a
Just no 2016-04-19 16:18:18 +02:00
Max Neunhoeffer 1e6b346db7 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 16:17:57 +02:00
Max Neunhoeffer 2bfe7b8b24 Finishing touches to performRequests. 2016-04-19 16:17:41 +02:00
Jan Steemann e592bc0480 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 16:12:42 +02:00
Alan Plum 64289b3895
I Shall Exterminate Everything Around Me 2016-04-19 16:12:19 +02:00
Jan Steemann b057d02396 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 16:09:23 +02:00
Jan Steemann be2ec7b9fc don't access allocatorThread when it's already destroyed 2016-04-19 16:08:32 +02:00
hkernbach 5c17f3a230 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-19 16:08:28 +02:00
hkernbach 668795dd41 removed no longer required files 2016-04-19 16:08:14 +02:00
hkernbach 9ac9331072 nodes view 2016-04-19 16:05:29 +02:00
Jan Steemann 240cb95f0c fixed crash 2016-04-19 15:54:10 +02:00
Max Neunhoeffer 4382ac89d1 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-19 15:41:04 +02:00
Max Neunhoeffer ed41c310c1 Fix synchronous replication. 2016-04-19 15:40:51 +02:00
Max Neunhoeffer d1bea93518 Fix too short timeout in server shutdown /Current/Lock in agency. 2016-04-19 15:40:19 +02:00
Jan Steemann 2254df14f0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-19 15:38:37 +02:00