Merge branch 'release/0.4' into develop

praekelt · Jul 28, 2014 · 989a3ee · 989a3ee
2 parents 67dae7f + e8d0718
commit 989a3ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,8 +1,8 @@
 Changelog
 =========
 
-next
-----
+0.4
+---
 #. Introduce `EchoResource` resource which does not proxy but returns to the
 client. `ReverseProxyResource` constructor signature has changed so update any
 subclasses you may have.

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@ def listify(filename):
 
 setup(
     name="device-proxy",
-    version="0.2",
+    version="0.4",
     url='http://github.com/praekelt/device-proxy',
     license='BSD',
     description="Device Proxy. A reverse HTTP Proxy that can inspect and "