summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2018-11-16 17:16:06 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2018-11-16 17:16:06 +0000
commit3f9548a88833701559f13eeb10df59dd49643ffd (patch)
treea45d5d1ba863bdbe273817e1593e1f84ff378dd7
parente1a9f4b4eb7642ecbadf189cd0cf8038400d39a8 (diff)
parentf7e0eaba0e82165e1431930389065e03f0516950 (diff)
downloadnix-3f9548a88833701559f13eeb10df59dd49643ffd.zip
Merge #973
973: CHANGELOG: move entry from #884 from 0.11.0 to [Unreleased] r=asomers a=mpasternacki PR #884 added changelog entry in section for 0.11.0, which has been already released, instead of in the [Unreleased] section (which wasn't present yet). Moved the entry where it belongs. Co-authored-by: Maciej Pasternacki <maciej@3ofcoins.net>
-rw-r--r--CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91300043..7dd7a4b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased]
### Added
+- Added `FromStr` and `Display` impls for `nix::sys::Signal`
+ ([#884](https://github.com/nix-rust/nix/pull/884))
- Added a `sync` wrapper.
([#961](https://github.com/nix-rust/nix/pull/961))
- Added a `sysinfo` wrapper.
@@ -82,8 +84,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
([#857](https://github.com/nix-rust/nix/pull/857))
- Added `request_code_write_int!` on FreeBSD/DragonFlyBSD
([#833](https://github.com/nix-rust/nix/pull/833))
-- Added `FromStr` and `Display` impls for `nix::sys::Signal`
- ([#884](https://github.com/nix-rust/nix/pull/884))
### Changed
- `Display` and `Debug` for `SysControlAddr` now includes all fields.