Merge pull request rust-lang#1180 from brson/bump

Bump
sfackler · Jun 24, 2017 · 92d0d1e · 92d0d1e
2 parents e28ae3b + 6e4ca8d
commit 92d0d1e
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# 1.5.0
+
+* [Rename references to multirust to rustup where applicable](https://github.com/rust-lang-nursery/rustup.rs/pull/1148)
+* [Update platform support in README](https://github.com/rust-lang-nursery/rustup.rs/pull/1159)
+* [Allow rustup to handle unavailable packages](https://github.com/rust-lang-nursery/rustup.rs/pull/1063)
+* [Update libz-sys and curl-sys](https://github.com/rust-lang-nursery/rustup.rs/pull/1176)
+* [Teach rustup to override the toolchain from a version file](https://github.com/rust-lang-nursery/rustup.rs/pull/1172)
+* [Update sha2 crate](https://github.com/rust-lang-nursery/rustup.rs/pull/1162)
+* [Check for unexpected cargo/rustc before install](https://github.com/rust-lang-nursery/rustup.rs/pull/705)
+* [Update PATH in .bash_profile](https://github.com/rust-lang-nursery/rustup.rs/pull/1179)
+
+Contributors: Allen Welkie, bors, Brian Anderson, Diggory Blake, Erick
+Tryzelaar, Ricardo Martins, Артём Павлов [Artyom Pavlov]
+
 # 1.4.0
 
 * [set_file_perms: if the file is already executable, keep it executable](https://github.com/rust-lang-nursery/rustup.rs/pull/1141)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup"
-version = "1.4.0"
+version = "1.5.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "Manage multiple rust installations with ease"
 

diff --git a/src/rustup-dist/Cargo.toml b/src/rustup-dist/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-dist"
-version = "1.4.0"
+version = "1.5.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "Installation from a Rust distribution server"
 build = "build.rs"

diff --git a/src/rustup-mock/Cargo.toml b/src/rustup-mock/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-mock"
-version = "1.4.0"
+version = "1.5.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "Test mocks for rustup"
 

diff --git a/src/rustup-utils/Cargo.toml b/src/rustup-utils/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustup-utils"
-version = "1.4.0"
+version = "1.5.0"
 authors = [ "Diggory Blake <diggsey@googlemail.com>" ]
 description = "Utility functions for rustup"
 

diff --git a/src/rustup-win-installer/Cargo.toml b/src/rustup-win-installer/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustup-win-installer"
-version = "1.4.0"
+version = "1.5.0"
 authors = ["Patrick Reisert"]
 build = "build.rs"