From 89171856b7ad949734db165bdbb26ba6bf39e754 Mon Sep 17 00:00:00 2001
From: Adrian Price-Whelan <adrian.prw@gmail.com>
Date: Sat, 7 Oct 2017 16:09:43 -0400
Subject: [PATCH] Preparing release v0.2.2

---
 CHANGES.md | 20 +++++++++++++++-----
 setup.py   |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index dfa4b0006..d0ab76a04 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,11 +1,21 @@
-0.3 (unreleased)
-================
+0.2.2 (2017-10-07)
+==================
 
-New Features
+New features
 ------------
+- Added a new coordinate frame aligned with the Palomar 5 stream.
+- Added a function ``gala.dynamics.combine`` to combine ``PhaseSpacePosition``
+  or ``Orbit`` objects.
 
-API-breaking changes
---------------------
+Bug fixes
+---------
+- Added a density function for the Kepler potential.
+- Added a density function for the Long & Murali bar potential
+
+Other changes
+-------------
+- Added JOSS paper.
+- Cleaned up some tests and documentation to use the ``Hamiltonian`` object.
 
 0.2.1 (2017-07-19)
 ==================
diff --git a/setup.py b/setup.py
index d12de0e58..5b88c78f8 100755
--- a/setup.py
+++ b/setup.py
@@ -47,7 +47,7 @@
 builtins._ASTROPY_PACKAGE_NAME_ = PACKAGENAME
 
 # VERSION should be PEP386 compatible (http://www.python.org/dev/peps/pep-0386)
-VERSION = '0.3.dev'
+VERSION = '0.2.2'
 
 # Indicates if this version is a release version
 RELEASE = 'dev' not in VERSION