From bf9ccbdbba2900cbb241f831c81d84d16883ed0b Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 14 Mar 2016 13:07:02 +0100
Subject: [PATCH] 6.1.0

---
 CHANGELOG.md | 7 +++++++
 VERSION      | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

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
-- 
2.47.0