Commit Graph

2 Commits

Author SHA1 Message Date
Raul Jordan
dafcfb2e18 Upstream Merge (#227)
sharding: merge upstream
Former-commit-id: 5129a4d5bc4395cd7c115b7f8db23541a512df3f [formerly e4f2b25a4277464c51b4c45384114a305464d3c4]
Former-commit-id: 2b4f0e356d3823889466d0f6ff22d5632f827f48
2018-07-02 14:25:06 -05:00
Raul Jordan
b9cb8a8194 sharding: fetch from upstream but keep travis the same
Former-commit-id: 75db983a69c7061e250b2756e5917ac5dd1ff7d2 [formerly 6e8e11322b931a70b5f2db8b5413c945834143fe]
Former-commit-id: 8de7b4c58f421e45bff2f0af167e2f2a27ddac49
2018-05-16 16:44:56 -04:00