From 209a0cd5b239f5a2f9fbb2d44e1ef813b759dde5 Mon Sep 17 00:00:00 2001
From: holger krekel <holger@merlinux.eu>
Date: Fri, 27 Sep 2013 14:15:53 +0200
Subject: [PATCH] is actually a new feature, the syntax:
 pytest.mark.parametrize("arg1,arg2", ...)

---
 CHANGELOG | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index dcb2c05ab..a9892d128 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,12 @@ new features:
   don't run teardownX.  This internally introduces a new method "node.addfinalizer()"
   helper which can only be called during the setup phase of a node.
 
+- simplify pytest.mark.parametrize() signature: allow to pass a CSV-separated string 
+  to specify argnames.  For example: 
+  ``pytest.mark.parametrize("input,expected",  [(1,2), (2,3)])``
+  works as well as the previous:
+  ``pytest.mark.parametrize(("input", "expected"), ...)``.
+
 - add support for setUpModule/tearDownModule detection, thanks Brian Okken.
 
 - integrate tab-completion on options through use of "argcomplete".
@@ -114,10 +120,6 @@ Bug fixes:
 
 - fix issue316 - properly reference collection hooks in docs
 
-- simplify parametrize() signature: allow to pass a CSV-separated string 
-  to specify argnames.  For example: ``pytest.mark.parametrize("input,expected",  [(1,2), (2,3)])`` is possible now in addition to the prior
-  ``pytest.mark.parametrize(("input", "expected"), ...)``.
-
 - fix issue 306 - cleanup of -k/-m options to only match markers/test
   names/keywords respectively.  Thanks Wouter van Ackooy.