From 3dc57d99f290eea86a28cd5e05734b24b37ecebd Mon Sep 17 00:00:00 2001
From: Ronny Pfannschmidt <opensource@ronnypfannschmidt.de>
Date: Wed, 18 Nov 2015 17:34:30 +0100
Subject: [PATCH] Changelog groming and release preps for 2.8.3

---
 CHANGELOG           | 8 ++++++++
 _pytest/__init__.py | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0957af637..f36296454 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,14 @@
   they stand out in the output.
   Thanks Gabriel Reis for the PR.
 
+- add more talks to the documentation
+- extend documentation on the --ignore cli option 
+- use pytest-runner for setuptools integration 
+- minor fixes for interaction with elcapitan system integrity protection (thanks Florian)
+
+
+
+
 2.8.2
 -----
 
diff --git a/_pytest/__init__.py b/_pytest/__init__.py
index 531a64977..613e036d3 100644
--- a/_pytest/__init__.py
+++ b/_pytest/__init__.py
@@ -1,2 +1,2 @@
 #
-__version__ = '2.8.3.dev1'
+__version__ = '2.8.3'