From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 14 Mar 2016 12:07:02 +0000 (+0100)
Subject: 6.1.0
X-Git-Tag: nepi-6.1.0-pypi
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=bf9ccbdbba2900cbb241f831c81d84d16883ed0b

6.1.0
---

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,
diff --git a/VERSION b/VERSION
index f1bb5eb8..dfda3e0b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.9
+6.1.0