From: bors <bors@rust-lang.org>
Date: Tue, 31 Oct 2017 15:22:31 +0000 (+0000)
Subject: Auto merge of #4687 - matklad:rust-1.22.0-backport, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~6^2~3
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3bab08445141279cc63f68f50be27623637e4c93;p=cargo.git

Auto merge of #4687 - matklad:rust-1.22.0-backport, r=alexcrichton

[beta] Don't update lockfiles from previous Cargo versions if `--locked` is passed
---

3bab08445141279cc63f68f50be27623637e4c93