summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-01-26 17:59:06 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-01-26 17:59:06 +0000
commit244ba416ce2d225cebf37bde0df53ad4cb064ceb (patch)
tree0294554d406c45b138c3db1786dc468eaca8777c
parent2b6966658c454a4607282dcdebd697016ecbad3b (diff)
parente811c270697e96405f8d3db3aff8fd98156fb3f9 (diff)
downloadnix-244ba416ce2d225cebf37bde0df53ad4cb064ceb.zip
Merge #845
845: 0.11.0 pre r=asomers a=asomers
-rw-r--r--CHANGELOG.md10
-rw-r--r--Cargo.toml4
-rw-r--r--RELEASE_PROCEDURE.md2
3 files changed, 13 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e66d514..dbe6110a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+## [Unreleased]
+
+### Added
+
+### Changed
+
+### Fixed
+
+### Removed
+
## [0.10.0] 2018-01-26
### Added
diff --git a/Cargo.toml b/Cargo.toml
index 661ee2ec..83cdaa0b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
[package]
name = "nix"
description = "Rust friendly bindings to *nix APIs"
-version = "0.10.0"
+version = "0.11.0-pre"
authors = ["The nix-rust Project Developers"]
repository = "https://github.com/nix-rust/nix"
license = "MIT"
@@ -13,7 +13,7 @@ exclude = [
]
[dependencies]
-libc = "0.2.36"
+libc = { git = "https://github.com/rust-lang/libc" }
bitflags = "1.0"
cfg-if = "0.1.0"
void = "1.0.2"
diff --git a/RELEASE_PROCEDURE.md b/RELEASE_PROCEDURE.md
index 9502765c..25ba11d6 100644
--- a/RELEASE_PROCEDURE.md
+++ b/RELEASE_PROCEDURE.md
@@ -36,6 +36,6 @@ branch.
- Add a new Unreleased section header to CHANGELOG.md.
- In `Cargo.toml`, update the version to the nextversion, e.g.
`v0.8.4`.
-- In `Cargo.tml`, revert the libc dependency to its git master branch.
+- In `Cargo.toml`, revert the libc dependency to its git master branch.
- Commit with a message like "Bump to v0.8.4"
- Make a pull request.