1
0
Fork 0
Commit Graph

29201 Commits

Author SHA1 Message Date
Andreas Streichardt 1fb0768e20 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 15:35:14 +02:00
Andreas Streichardt 5d3df815b1 Revert "Remove relative leftovers"
This reverts commit 30686c70ba.
2016-04-25 15:35:04 +02:00
Jan Steemann d391e15680 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-25 15:31:51 +02:00
Jan Steemann c8c8625727 try to fix some undefined behavior on cluster startup 2016-04-25 15:31:23 +02:00
Michael Hackstein ecf267f369 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 15:25:31 +02:00
Michael Hackstein 85a2c3a44c The shortestPath computation now uses Slices instead of strings to identify the documents. 2016-04-25 15:25:22 +02:00
Andreas Streichardt c0b2a29634 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 15:19:37 +02:00
Andreas Streichardt 30686c70ba Remove relative leftovers 2016-04-25 15:19:16 +02:00
Alan Plum 7b9085b009
Clear+recreate internal sessions to refresh them 2016-04-25 14:22:10 +02:00
Jan Steemann f93017d880 fix Visual Studio warning 2016-04-25 14:17:35 +02:00
Jan Steemann 80bf3bbbb2 fixed some of my own noobness 2016-04-25 14:00:37 +02:00
Jan Steemann 5ea01c02b0 fixed number of threads detection 2016-04-25 13:57:59 +02:00
Andreas Streichardt 22e1292420 Reset to 1000ms again 2016-04-25 13:26:27 +02:00
Andreas Streichardt 5257c3fb52 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 13:19:34 +02:00
Andreas Streichardt c5cbc1ae7d Fix cluster collection handling 2016-04-25 13:19:13 +02:00
Michael Hackstein 3065ceafad Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 12:35:59 +02:00
jsteemann 8bc19eaa51 fix insertion 2016-04-25 11:39:26 +02:00
Michael Hackstein db9a4e4af4 Replaced extractIdString by a more optimized variant, which considers the already known collectionname in some graph functions 2016-04-25 11:13:09 +02:00
jsteemann 1fb953a515 improve insertion time 2016-04-25 10:40:48 +02:00
hkernbach 8ab7442475 grunt build 2016-04-25 08:45:42 +02:00
hkernbach 2b18fe67a1 frontend: scss, views, templates, documents view 2016-04-25 08:32:38 +02:00
hkernbach 5c318b324d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 08:11:25 +02:00
Frank Celler b0f418ac84 removed unused function 2016-04-24 13:59:28 -07:00
jsteemann 67a0bafbaa fix options 2016-04-24 21:06:09 +02:00
jsteemann e0dd623865 removed duplicate declarations 2016-04-24 20:17:39 +02:00
jsteemann f660587336 fix importing of unsupported index types 2016-04-24 19:15:26 +02:00
jsteemann 2f6510689b removed unused JSON functionality 2016-04-24 18:48:10 +02:00
jsteemann 4b7e0a72d0 moved --version into a feature of its own 2016-04-24 18:42:59 +02:00
jsteemann fe42176772 make system collections a bit smaller 2016-04-24 16:34:40 +02:00
jsteemann f4fb6f0dcd fixed arango-dfdb 2016-04-24 16:19:56 +02:00
jsteemann 40d4275871 removed useless method 2016-04-24 15:41:29 +02:00
jsteemann 58198a834e re-added options for foxx queues 2016-04-24 15:27:08 +02:00
jsteemann e3ed9812b4 use value stored in "count" value of collection when re-loading 2016-04-24 14:36:19 +02:00
jsteemann 65a03d2c58 delete duplicate log message 2016-04-24 14:29:49 +02:00
jsteemann dcc5825f93 cleaned up features a bit 2016-04-24 14:29:29 +02:00
Frank Celler 1976f2f5b6 fixed wrong usage of error 2016-04-23 22:17:36 -07:00
Frank Celler 2cb73ce625 cosmetics 2016-04-23 22:14:57 -07:00
Frank Celler 7f35ddc22b fixed assert 2016-04-23 19:55:43 -07:00
Frank Celler 3091b17ab9 do not use v8_build in precompiled mode 2016-04-23 19:30:42 -07:00
Frank Celler 6a9434d6cf fixed assert 2016-04-23 19:29:26 -07:00
Frank Celler 481f342385 merge fixes 2016-04-23 19:02:21 -07:00
Frank Celler c46eb8e65e added LogfileManager as feature 2016-04-23 16:34:57 -07:00
Frank Celler d6e8046992 updated cleanupCFiles 2016-04-23 16:34:57 -07:00
Frank Celler fe2bd7a813 fixed help message 2016-04-23 16:34:57 -07:00
jsteemann 4db5377b7f fix over-simplified highlighting of matching parens 2016-04-23 22:42:00 +02:00
jsteemann 07a0e0156d add fix vor Visual Studio 2015 update 2 2016-04-23 21:30:29 +02:00
jsteemann 3570ecf91c nicer program options 2016-04-23 21:28:40 +02:00
jsteemann 7866e5da1f allow out of memory 2016-04-23 21:11:35 +02:00
jsteemann 82e814cc69 cppcheck 2016-04-23 20:49:58 +02:00
jsteemann 5b59b6dacd use generateResult instead of home-made solution 2016-04-23 20:49:43 +02:00