Merge pull request #432 from brson/changelog

Add two more PRs to the 0.1.10 changelog

Author: brson

CHANGELOG.md

@@ -1,5 +1,7 @@
 # 0.1.10
 
+* [Multiple cli improvements](https://github.com/rust-lang-nursery/rustup.rs/pull/419).
+* [Support HTTP protocol again](https://github.com/rust-lang-nursery/rustup.rs/pull/431).
 * [Improvements to welcome screen](https://github.com/rust-lang-nursery/rustup.rs/pull/418).
 * [Don't try to update non-tracking channels](https://github.com/rust-lang-nursery/rustup.rs/pull/425).
 * [Don't panic when NativeSslStream lock is poisoned](https://github.com/rust-lang-nursery/rustup.rs/pull/429).

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup"
-version = "0.1.11-pre"
+version = "0.1.10"
 authors = [ "Diggory Blake <[email protected]>" ]
 description = "multirust in rust - manage multiple rust installations with ease"
 
@@ -18,9 +18,9 @@ license = "MIT OR Apache-2.0"
 build = "build.rs"
 
 [dependencies]
-rustup-dist = { path = "src/rustup-dist", version = "0.1.11-pre" }
-rustup-utils = { path = "src/rustup-utils", version = "0.1.11-pre" }
-error-chain = { path = "src/error-chain", version = "0.1.11-pre" }
+rustup-dist = { path = "src/rustup-dist", version = "0.1.10" }
+rustup-utils = { path = "src/rustup-utils", version = "0.1.10" }
+error-chain = { path = "src/error-chain", version = "0.1.10" }
 clap = "2.2.4"
 regex = "0.1.41"
 url = "1.1.0"
@@ -42,7 +42,7 @@ user32-sys = "0.1.2"
 kernel32-sys = "0.2.1"
 
 [dev-dependencies]
-rustup-mock = { path = "src/rustup-mock", version = "0.1.11-pre" }
+rustup-mock = { path = "src/rustup-mock", version = "0.1.10" }
 lazy_static = "0.1.15"
 
 [lib]

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "error-chain"
-version = "0.1.11-pre"
+version = "0.1.10"
 authors = [ "Brian Anderson <[email protected]>",
             "Paul Colomiets <[email protected]>",
             "Colin Kiegel <[email protected]>"]

src/error-chain/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-dist"
-version = "0.1.11-pre"
+version = "0.1.10"
 authors = [ "Diggory Blake <[email protected]>" ]
 description = "Installation from a Rust distribution server"
 build = "build.rs"
@@ -23,9 +23,9 @@ tempdir = "0.3.4"
 walkdir = "0.1.5"
 toml = "0.1.27"
 sha2 = "0.1.2"
-rustup-utils = { path = "../rustup-utils", version = "0.1.11-pre" }
-error-chain = { path = "../error-chain", version = "0.1.11-pre" }
-rustup-mock = { path = "../rustup-mock", version = "0.1.11-pre" }
+rustup-utils = { path = "../rustup-utils", version = "0.1.10" }
+error-chain = { path = "../error-chain", version = "0.1.10" }
+rustup-mock = { path = "../rustup-mock", version = "0.1.10" }
 
 [lib]
 name = "rustup_dist"

src/rustup-dist/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-mock"
-version = "0.1.11-pre"
+version = "0.1.10"
 authors = [ "Diggory Blake <[email protected]>" ]
 description = "Test mocks for multirust"
 
@@ -19,7 +19,7 @@ tempdir = "0.3.4"
 itertools = "0.4.1"
 tar = "0.4.0"
 toml = "0.1.27"
-rustup-utils = { path = "../rustup-utils", version = "0.1.11-pre" }
+rustup-utils = { path = "../rustup-utils", version = "0.1.10" }
 sha2 = "0.1.2"
 
 [target."cfg(windows)".dependencies]

src/rustup-mock/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-utils"
-version = "0.1.11-pre"
+version = "0.1.10"
 authors = [ "Diggory Blake <[email protected]>" ]
 description = "multirust in rust - manage multiple rust installations with ease"
 
@@ -14,7 +14,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 rand = "0.3.11"
 scopeguard = "0.1.2"
-error-chain = { path = "../error-chain", version = "0.1.11-pre" }
+error-chain = { path = "../error-chain", version = "0.1.10" }
 libc = "0.2.0"
 native-tls = { git = "https://github.com/sfackler/rust-native-tls.git" }
 rustc-serialize = "0.3.19"