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 |