From 980cf05cdf1d21c9b68e0eb1bd20af58f6a0518a Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 24 Apr 2017 08:43:58 -0700
Subject: [PATCH] Prepare the 1.17.0 release

* Update channel we're building
* Update the cargo submodule to the tip of the `rust-1.17.0` branch
---
 cargo         | 2 +-
 src/ci/run.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cargo b/cargo
index d8d0940a97a83..fe7b0cdcf5ca7 160000
--- a/cargo
+++ b/cargo
@@ -1 +1 @@
-Subproject commit d8d0940a97a83ed2e4eb340cafea4ed7f601f158
+Subproject commit fe7b0cdcf5ca7aab81630706ce40b70f6aa2e666
diff --git a/src/ci/run.sh b/src/ci/run.sh
index 1cd173628dd8d..228880f66009e 100755
--- a/src/ci/run.sh
+++ b/src/ci/run.sh
@@ -41,7 +41,7 @@ fi
 # FIXME: need a scheme for changing this `nightly` value to `beta` and `stable`
 #        either automatically or manually.
 if [ "$DEPLOY$DEPLOY_ALT" != "" ]; then
-  RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=beta"
+  RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --release-channel=stable"
   RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-static-stdcpp"
 
   if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then