merging releases.md and CHANGES.md

stlab · Nov 28, 2017 · 757616f · 757616f
1 parent 2271c3f
commit 757616f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 34 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -14,6 +14,8 @@
     - Concurrency library
         - [serial queue](stlab/concurrency/serial_queue.hpp)
         - [task](stlab/concurrency/task.hpp)
+        - Added feature requests [#95](https://github.com/stlab/libraries/issues/95) (flatten futures) and [#38](https://github.com/stlab/libraries/issues/38) (reduction on `future<void>`). Reduction of futures is now supported. So a `future<future<T>>` is reduced to `future<T>`. Currently
+this is restricted to copyable types `T`.
     - [copy on write](stlab/copy_on_write.hpp)
     - [scope](stlab/scope.hpp)
     - [Test library](stlab/test/model.hpp)

diff --git a/README.md b/README.md
@@ -23,11 +23,9 @@ multiple CPU cores while minimizing contention. This library solves several prob
 
 # Documentation
 
-The complete documentation is available on the [stlab home page](http://stlab.cc) 
+The complete documentation is available on the [stlab home page](http://stlab.cc).
 
-# Release
-
-[Version 1.1](readme.md)
+Release changelogs are listed in [CHANGES.md](CHANGES.md).
 
 # Building
 

diff --git a/release.md b/release.md