6.1.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c999d8..2114f54 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 6.1.0 - Mar 14, 2016
+
+* linux::Application receives new attribute `splitStderr`
+* that defaults to False
+* stdout and stderr are now merged by default in the `stdout` trace
+* previous behaviour can be achieved by setting this new attribute to `True`
+
 # 6.0.9 - Mar 11, 2016
 
 * register_resource also supports the `connectedTo` keyword,

diff --git a/VERSION b/VERSION
index f1bb5eb..dfda3e0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.9
+6.1.0