From 49eb7301366c6ce79ca3a6c16b3d077110c4f0fe Mon Sep 17 00:00:00 2001
From: Brian Thorne <brian@thorne.link>
Date: Sat, 30 Jun 2018 15:03:29 +1000
Subject: [PATCH] Add changelog highlights and set version to 2.2.0

---
 CHANGELOG.txt   | 13 +++++++++++++
 can/__init__.py |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 06b6ef4ee..781feef24 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,3 +1,16 @@
+
+Version 2.2.0 (2018-06-30)
+=====
+
+* Fallback message filtering implemented in Python for interfaces that don't offer better accelerated mechanism.
+* SocketCAN interfaces have been merged (Now use `socketcan` instead of either `socketcan_native` and `socketcan_ctypes`),
+  this is now completely transparent for the library user.
+* automatic detection of available configs/channels in supported interfaces.
+* Added synchronized (thread-safe) Bus variant.
+* context manager support for the Bus class.
+* Dropped support for Python 3.3 (officially reached end-of-life in Sept. 2017)
+* Deprecated the old `CAN` module, please use the newer `can` entry point (will be removed in version 2.4)
+
 Version 2.1.0 (2018-02-17)
 =====
 
diff --git a/can/__init__.py b/can/__init__.py
index 370260429..e10968cd7 100644
--- a/can/__init__.py
+++ b/can/__init__.py
@@ -9,7 +9,7 @@
 
 import logging
 
-__version__ = "2.2.0-rc.1"
+__version__ = "2.2.0"
 
 log = logging.getLogger('can')