Merge branch 'release/0.10.0' into develop

CenterForOpenScience · Aug 10, 2015 · 340fb2c · 340fb2c
2 parents 1e3f29f + f4532e4
commit 340fb2c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,10 @@
 ChangeLog
 *********
 
+0.10.0 (2015-08-10)
+===================
+- Allow S3 uploads to be encrypted at rest via S3's API
+
 0.9.0 (2015-07-29)
 ==================
 

diff --git a/waterbutler/__init__.py b/waterbutler/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.9.1'
+__version__ = '0.10.0'
 __import__('pkg_resources').declare_namespace(__name__)