Merge branch 'feature/changelog-update' into dev

ama-team · Aug 15, 2017 · 69fa8a0 · 69fa8a0
2 parents 33f5190 + 506c384
commit 69fa8a0
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
+- Timeouts for HTTP clients & integration for revamped Slf4j
+- .Concurrent.Future class
+- .Concurrent.timeout functions
+- .Concurrent.TaskQueue class
 - Slf4j now provides static methods to create and manage loggers
 ### Changed
 - Slf4j Factory has been substituted with Context class