From: Chris Swindle Date: Wed, 1 Nov 2017 19:55:47 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/master' into alt-registry-publish-wip X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~5^2~1^2~5 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8714f5ffd935443daf304feb36d037acc18e9ca2;p=cargo.git Merge remote-tracking branch 'upstream/master' into alt-registry-publish-wip --- 8714f5ffd935443daf304feb36d037acc18e9ca2 diff --cc src/cargo/ops/registry.rs index a7e8ef82b,d8364c28d..a7e8ef82b mode 100755,100644..100644 --- a/src/cargo/ops/registry.rs +++ b/src/cargo/ops/registry.rs diff --cc tests/publish.rs index d4af2e99a,d63087fe2..d4af2e99a mode 100755,100644..100644 --- a/tests/publish.rs +++ b/tests/publish.rs