Updaet changelog and correct attributions.

ionelmc · Nov 28, 2015 · 9154be2 · 9154be2
1 parent 83b0add
commit 9154be2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -4,3 +4,7 @@ Authors
 
 * Ionel Cristian Mărieș - http://blog.ionelmc.ro
 * Marc Abramowitz - http://marc-abramowitz.com
+* Dave Collins - https://github.com/thedavecollins
+* Stefan Krastanov - http://blog.krastanov.org/
+* Thomas Waldmann - https://github.com/ThomasWaldmann
+* Antonio Cuni - http://antocuni.eu/en/
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,12 @@
 Changelog
 =========
 
+3.1.0 (unreleased)
+------------------
+
+* Added ``--benchmark-colums`` command line option. It selects what columns are displayed in the result table. Contributed by
+  Antonio Cuni in `PR#34 <https://github.com/ionelmc/pytest-benchmark/pull/34>`_.
+
 3.0.0 (2015-11-08)
 ------------------
 
@@ -68,7 +74,8 @@ Changelog
 3.0.0a1 (2015-09-13)
 --------------------
 
-* Added JSON report saving (the ``--benchmark-json`` command line arguments).
+* Added JSON report saving (the ``--benchmark-json`` command line arguments). Based on initial work from Dave Collins in
+  `PR#8 <https://github.com/ionelmc/pytest-benchmark/pull/8>`_.
 * Added benchmark data storage(the ``--benchmark-save`` and ``--benchmark-autosave`` command line arguments).
 * Added comparison to previous runs (the ``--benchmark-compare`` command line argument).
 * Added performance regression checks (the ``--benchmark-compare-fail`` command line argument).
@@ -156,5 +163,5 @@ Changelog
 ? (?)
 -----
 
-* Readme and styling fixes (contributed by Marc Abramowitz)
+* Readme and styling fixes. Contributed by Marc Abramowitz in `PR#4 <https://github.com/ionelmc/pytest-benchmark/pull/4>`_.
 * Lots of wild changes.