1
0
Fork 0
Commit Graph

40368 Commits

Author SHA1 Message Date
jsteemann 33c577dd80 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-06-02 13:05:07 +02:00
jsteemann c0b3b251d8 updated CHANGELOG 2017-06-02 13:04:59 +02:00
Simon Grätzer 51ee57a38f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-06-02 13:04:00 +02:00
jsteemann 7932fc898d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-06-02 13:01:04 +02:00
Mop bf829ff665 Add warning about tcp_tw_recycle 2017-06-02 12:51:02 +02:00
Andreas Streichardt 3e4a07e7de Fix cluster 2017-06-02 12:45:51 +02:00
jsteemann a164670ee1 properly delete memory 2017-06-02 12:45:24 +02:00
Simon Grätzer 10f6242932 removing dead code 2017-06-02 12:22:39 +02:00
Simon Grätzer 3909e6b3af Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/edge-index-hacks 2017-06-02 12:15:32 +02:00
Simon Grätzer 6e1e54b8fb fixing weighted shortest path finder 2017-06-02 12:15:18 +02:00
Wilfried Goesgens c330419572 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-06-02 11:47:36 +02:00
Wilfried Goesgens e9ed2a5b98 fix anchor from 46b50c266c 2017-06-02 11:47:15 +02:00
Andreas Streichardt 07364e857d Remove useless debug 2017-06-02 11:47:05 +02:00
Andreas Streichardt e63a707d1c Fix 1 DBServer startup 2017-06-02 11:39:38 +02:00
Simon Grätzer 87de810566 Edge index refactoring 2017-06-02 11:20:15 +02:00
Simon Grätzer c0e6538534 Update README.md 2017-06-02 09:34:11 +02:00
Michael Hackstein ce9812d8fa Added proper sorting in test code. Not deterministic otherwise 2017-06-02 09:33:30 +02:00
Wilfried Goesgens aa3e8c1537 fix service state detection 2017-06-01 18:56:27 +02:00
Mop 619eae9be5 Revert "Squashed commit of the following:"
This reverts commit 2252088572.
2017-06-01 18:37:45 +02:00
Jan Christoph Uhde 0669e517ed Fix creation of millions of VPackBuilders in edge import - part 1 - #194 2017-06-01 17:58:18 +02:00
jsteemann d402ea62cb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-06-01 17:52:36 +02:00
jsteemann 4fe7247b80 fixed a race in RocksDB group commit.
it seems that the most relevant part of this fix has also been made upstream so we can forget about this change after upgrading to latest RocksDB (5.5.0 or higher)
2017-06-01 17:51:22 +02:00
Andreas Streichardt 15e622d9c9 Fix naming 2017-06-01 17:50:23 +02:00
Andreas Streichardt 2252088572 Squashed commit of the following:
commit f3d0fd6584b0e451b8c97abcb4ba8d9f2fc6f560
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Thu Jun 1 17:31:36 2017 +0200

    fix unittest

commit 7cd3544a39e1b78af9d4175cb3b978799b9bbfff
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Thu Jun 1 17:10:00 2017 +0200

    Remove debug comment

commit fb6b10dac15be49a72dbff80030a7d22abdfc3e0
Merge: 055eb1d269 6b18cc64fe
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Thu Jun 1 17:00:21 2017 +0200

    Merge branch 'devel' into shardorganizer

commit 055eb1d2693a583d21ea59ec8b6ba95ab0db57ac
Merge: 1ff7998ebf 8ea89b7677
Author: Mop <andreas@arangodb.com>
Date:   Thu Jun 1 16:56:30 2017 +0200

    Merge branch 'shardorganizer' of https://github.com/arangodb/arangodb into shardorganizer

commit 8ea89b76777c75b6a77bf695c3f074a0c4643c29
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Thu Jun 1 16:55:41 2017 +0200

    Fix shardmapping bug

commit 1ff7998ebfd691598ec5b455ca5bc2bfd7020fb4
Author: Mop <andreas@arangodb.com>
Date:   Wed May 31 17:26:08 2017 +0200

    more output

commit 68e88aa0e14316c4929d05b2c151bee6421d754d
Merge: 0978ad1d9e 44a6a78ec3
Author: Mop <andreas@arangodb.com>
Date:   Wed May 31 17:03:33 2017 +0200

    Merge branch 'shardorganizer' of https://github.com/arangodb/arangodb into shardorganizer

commit 44a6a78ec338a1e7cabb15464500d96b84c68f1d
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed May 31 07:42:43 2017 -0700

    Fix namespace

commit 0978ad1d9e2f01b86204990e74b66958f25eba66
Merge: f98582ccff d74e5989ad
Author: Mop <andreas@arangodb.com>
Date:   Wed May 31 16:40:35 2017 +0200

    Merge branch 'shardorganizer' of https://github.com/arangodb/arangodb into shardorganizer

commit f98582ccff3448f6c2388dab4cc2dc38034271b0
Author: Mop <andreas@arangodb.com>
Date:   Wed May 31 16:39:03 2017 +0200

    Revert "Revert "Next attempt at merging ShardOrganizer...distributeShardsLike fixed""

    This reverts commit fed45b7b10.

commit d74e5989ad478efe7d66d196715c05f4f41c9c29
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed May 31 16:31:31 2017 +0200

    Make it an error

commit 0a6a9ef9464df4f24ad205bbab5b9f8ded50054f
Author: Andreas Streichardt <andreas@arangodb.com>
Date:   Wed May 31 12:42:51 2017 +0200

    distributeShardsLike has to be saved as a cidString
2017-06-01 17:32:40 +02:00
jsteemann 377431b138 abort waitForSync ops during server shutdown 2017-06-01 17:07:09 +02:00
jsteemann 6b18cc64fe dont use explicit when unnecessary 2017-06-01 16:47:56 +02:00
jsteemann 9015e4ca7c don't print empty warnings 2017-06-01 16:47:41 +02:00
Simon Grätzer 7b2306446d Merge branch 'devel' of https://github.com/arangodb/arangodb into feature/edge-index-hacks 2017-06-01 16:09:36 +02:00
Simon Grätzer 3e8c16d1a7 Adding edge key into edge index 2017-06-01 16:07:39 +02:00
Wilfried Goesgens 658af3cb89 fix grammer, mention author 2017-06-01 15:51:35 +02:00
Wilfried Goesgens ffb5e06f44 implement prototype for finding out the service startup error 2017-06-01 15:36:10 +02:00
jsteemann d13144f389 fixed issue #2515 2017-06-01 13:45:47 +02:00
Michael Hackstein 65192862c2 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-06-01 13:34:22 +02:00
Michael Hackstein 625a3ac2f4 The single server edge cursor is now more resiliont to 0 document tokens (returned by primary only) 2017-06-01 13:34:10 +02:00
jsteemann 567e4bc21e fix typo 2017-06-01 13:05:35 +02:00
Wilfried Goesgens 2006a53342 remove debug dialogs 2017-06-01 12:26:09 +02:00
jsteemann b86478ca20 fixed struct/class confusion 2017-06-01 12:06:14 +02:00
Alan Plum 4b4b9f8c55 Fix Foxx API error (#2517)
* Fix Foxx API error
* Manager should distinguish between errors and services
* Foxx API should not require service to exist for uninstall
  if force option is used
* Respect options.force in FM _install
2017-06-01 11:59:04 +02:00
Wilfried Goesgens 4d73e13bb3 Rework windows installer
- throw out old MUI1 dialogs - CPack only knows howto create one page
  - split the password and database type to a second page that we hide if we install over an existing installation
  - cleanup the installscope mess
2017-06-01 11:31:22 +02:00
jsteemann b8c198df5d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-06-01 11:14:19 +02:00
jsteemann 4985911a65 documentation updates 2017-06-01 11:14:12 +02:00
Michael Hackstein 7c505396be Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-06-01 11:05:41 +02:00
Michael Hackstein 655aaf415e Fixed an undefined behaviour bug in shortest-path implementation introduced with the latest reordering 2017-06-01 11:05:26 +02:00
jsteemann 3df0940c7e jslint 2017-06-01 10:31:42 +02:00
Akshesh Doshi 46b50c266c Add tests and docs for REGEX_REPLACE AQL function (#2518)
* Fixed #1902: Add tests and documentation for REGEX_REPLACE

* Cleanup
2017-06-01 10:29:43 +02:00
mpv1989 e277051f5e Generate swagger docs 2017-06-01 10:11:02 +02:00
jsteemann c590941746 increase default value for block_size to 16 * 1024 2017-06-01 10:06:02 +02:00
jsteemann a68c95d2b7 try to honor server shutdown while locks are held 2017-06-01 02:24:00 +02:00
jsteemann b91eab0ce8 honor transaction options 2017-06-01 02:01:33 +02:00
jsteemann 8b6e9ec793 adjust warning 2017-06-01 01:24:50 +02:00