From: bors <bors@rust-lang.org>
Date: Wed, 30 Nov 2016 18:16:39 +0000 (+0000)
Subject: Auto merge of #3345 - alexcrichton:release-branches, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~11^2~108
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=294c7e5c2bf4903d476df5367a3df29de9e4e85e;p=cargo.git

Auto merge of #3345 - alexcrichton:release-branches, r=alexcrichton

Add support for release branches in Cargo

Follow the same strategy as the compiler for now in basically every respect:

* Add new `--release-channel` configure option, defaulting to `dev`
* Remove old `--enable-nightly`
* Add `--enable-build-openssl` as an orthogonal option
* Hook up Travis/AppVeyor to stable/beta/master branches to do the right
  channel builds.
---

294c7e5c2bf4903d476df5367a3df29de9e4e85e