projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e9b2c5f 6bf3b27)
Merge branch '10291-discovery-blacklist' refs #10291
authorTom Clegg <tom@curoverse.com>
Thu, 20 Oct 2016 09:15:49 +0000 (05:15 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 20 Oct 2016 09:15:49 +0000 (05:15 -0400)

Trivial merge