prepare 2.2.0

ployground · Nov 8, 2016 · 674e0f5 · fschulze · Nov 8, 2016 · 674e0f5
1 parent f428875
commit 674e0f5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,9 @@
-2.2.0 - Unreleased
+2.2.0 - 2016-11-08
 ==================
 
-- add fabric helpers to keep pkg up-to-date on the host, inside jails and for the bsdploy flavour
+- [feature] add fabric helpers to keep pkg up-to-date on the host, inside jails and for the bsdploy flavour
+- [feature] add support for bootstrapping on Digital Ocean by setting `bootstrap` to `digitalocean` in the `ez-master` definition
+- [fix] allow setting a non-default zfs root for ezjail by setting `jails_zfs_root` in the `ez-master` definition
 
 
 2.1.0 - 2015-07-26

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 README = open(os.path.join(here, 'README.rst')).read()
 CHANGES = open(os.path.join(here, 'CHANGES.rst')).read()
 
-version = "2.2.0dev"
+version = "2.2.0d"
 
 install_requires = [
     'PyYAML',