Updated changelog and reverted .travis.yml

nix-rust · Oct 7, 2018 · 0087f07 · 0087f07
1 parent bfde1f5
commit 0087f07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -141,7 +141,6 @@ branches:
     # bors-ng branches; see https://bors-ng.github.io/getting-started/
     - trying
     - staging
-    - issue-947
 
 notifications:
   email:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,6 +18,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   ([#930](https://github.com/nix-rust/nix/pull/930))
 - Added `futimens` and `utimesat` wrappers ([#944](https://github.com/nix-rust/nix/pull/944))
   and a `utimes` wrapper ([#946](https://github.com/nix-rust/nix/pull/946)).
+- Added support for `ptrace` on BSD operating systems ([#949](https://github.com/nix-rust/nix/pull/949))
+- Added `ptrace` functions for reads and writes to tracee memory ([#949](https://github.com/nix-rust/nix/pull/949))
 
 ### Changed
 - Increased required Rust version to 1.22.1/