From 5ca3bb9df2ece160a62235848e7ee99b20c3bc58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= <rhubscher@mozilla.com>
Date: Wed, 10 Jun 2015 15:11:03 +0200
Subject: [PATCH] Preparing release 1.0.0

---
 CHANGES.rst           | 6 ++++--
 circusweb/__init__.py | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index fc5e23a..7187f45 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,10 +1,12 @@
 CHANGES
 =======
 
-0.6 (unreleased)
-----------------
+1.0.0 (2015-06-10)
+------------------
 
 * Allow deactivation of a running worker - #30
+* Port to Python3
+* Port to TornadoIO 2
 
 
 0.5 (2014-05-21)
diff --git a/circusweb/__init__.py b/circusweb/__init__.py
index 391a948..26f9f4f 100644
--- a/circusweb/__init__.py
+++ b/circusweb/__init__.py
@@ -1,4 +1,4 @@
 import logging
 
-__version__ = '0.6'
+__version__ = '1.0.0'
 logger = logging.getLogger('circus-web')