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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c999d8f..f4c79f64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# 6.1.1 - Mar 16, 2016
+
+* undo dirty hack for python3 and subprocesses considered as producing
+  text outputs without distinction
+* this jeopardizes python3 code for now, but brings more stability to
+  python2 scripts in the short term; needs more work on the long run
+* a linux application that generates non-empty stderr is not considered
+  broken anymore
+
+# 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,