From 2f577791db7206e54677dee4482cc065d39aa91e Mon Sep 17 00:00:00 2001
From: Ian Cordasco <graffatcolmingov@gmail.com>
Date: Sun, 4 Jan 2015 14:49:07 -0600
Subject: [PATCH] Bump version to 2.3.0 and update changelog

---
 CHANGES.rst        | 11 +++++++++++
 flake8/__init__.py |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index a28651a..19f723d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,6 +1,17 @@
 CHANGES
 =======
 
+2.3.0 - 2015-01-04
+------------------
+
+- **Feature**: Add ``--output-file`` option to specify a file to write to
+  instead of ``stdout``.
+
+- **Bug** Fix interleaving of output while using multiprocessing
+  (`GitLab#17`_)
+
+.. _GitLab#17: https://gitlab.com/pycqa/flake8/issues/17
+
 2.2.5 - 2014-10-19
 ------------------
 
diff --git a/flake8/__init__.py b/flake8/__init__.py
index 3db1b9f..8219039 100644
--- a/flake8/__init__.py
+++ b/flake8/__init__.py
@@ -1 +1 @@
-__version__ = '2.2.5'
+__version__ = '2.3.0'