sharding: merge changes from #124 in master

Former-commit-id: eb43aec855d5c71576a06fe69d446952c8b56ecf [formerly 5152e1a708b9ae6abbc2888a313829b9ef8cc626]
Former-commit-id: e4cb88a6fcbb88d61b7867189ecb65a6448b973e
This commit is contained in:
Raul Jordan 2018-05-22 11:24:44 -04:00
commit ddc9f3cc97

File diff suppressed because it is too large Load Diff