X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=CHANGELOG.md;h=2114f544fc89fee9a7ca9376264b5958de69b10b;hb=40e6d376152c072bc852117f0a58e88d9e0024af;hp=8c999d8f9c16afb2861ee165c27ee9aa6c6b37fd;hpb=603d35c0b9631213c4c2fe955255476fe92247ae;p=nepi.git

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c999d8f..2114f544 100644
--- 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,