Merge tag '0.17.0' into develop

felliott · felliott · commit 8f5d502d958e · 2016-10-11T16:46:31.000-04:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,15 @@
 ChangeLog
 *********
 
+0.17.0 (2016-10-11)
+===================
+- Feature: WaterButler accepts configuration from the environment, overriding any file-based
+configuration.  This helps MFR integrate nicer in a docker-compose environment. (thanks, @icereval!)
+- Fix: Fix pdf presentation mode on Safari. (thanks, @darioncassel!)
+- Fix: Fix aiohttp crashing on gzipped HEAD requests.
+- Fix: Fix incorrect WB API usage metrics.
+- Code: Bump raven dependency to 5.27.0.
+
 0.16.0 (2016-09-13)
 ===================
 - Feature: MFR now does .sav conversion via pspp-convert instead of rpy2.
diff --git a/mfr/__init__.py b/mfr/__init__.py
@@ -1,2 +1,2 @@
-__version__ = '0.16.0'
+__version__ = '0.17.0'
 __import__('pkg_resources').declare_namespace(__name__)

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-__version__ = '0.16.0'`
	`1`	`+__version__ = '0.17.0'`
`2`	`2`	`__import__('pkg_resources').declare_namespace(__name__)`