Merge pull request #693 from ajschmidt8/branch-0.19-merge-0.18

Fix merge conflicts for #692
rapidsai · Feb 4, 2021 · 73db07e · 73db07e
2 parents 5b7e99c + 283ff20
commit 73db07e
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,18 +6,9 @@
 
 ## Bug Fixes
 
-# RMM 0.18.0 (Date TBD)
-
-## New Features
-
-- PR #636 Add a `Stream` class to manage CUDA streams in Python
-
-## Improvements
-
-- PR #647 Simplify `rmm::exec_policy` and refactor Thrust support
-
-## Bug Fixes
+# 0.18.0
 
+Please see https://github.com/rapidsai/rmm/releases/tag/branch-0.18-latest for the latest changes to this development branch.
 
 # RMM 0.17.0 (10 Dec 2020)