From 8589b8c174b1945112f5a4c5e991ef520e57f297 Mon Sep 17 00:00:00 2001
From: Itamar Turner-Trauring <itamar@itamarst.org>
Date: Sun, 9 Mar 2014 13:48:02 -0400
Subject: [PATCH] Update changelog and version in preparation for next release.

---
 README.rst          | 18 ++++++++++++------
 crochet/_version.py |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/README.rst b/README.rst
index f9a62c1..1eb93d1 100644
--- a/README.rst
+++ b/README.rst
@@ -32,15 +32,21 @@ Changelog
 
 **1.1.0**
 
-Documentation:
-
-* ``EventualResult.original_failure`` is now documented.
-
 Bug fixes:
 
+* ``EventualResult.wait()`` can now be used safely from multiple threads,
+  thanks to Gavin Panella for reporting the bug.
+* Fixed reentrancy deadlock in the logging code caused by
+  http://bugs.python.org/issue14976, thanks to Rod Morehead for reporting the
+  bug.
+* Crochet now installs on Python 3.3 again, thanks to Ben Cordero.
 * Crochet should now work on Windows, thanks to Konstantinos Koukopoulos.
-* It should now be possible to run Crochet tests without adding its absolute
-  path to PYTHONPATH or installing it first.
+* Crochet tests can now run without adding its absolute path to PYTHONPATH or
+  installing it first.
+
+Documentation:
+
+* ``EventualResult.original_failure`` is now documented.
 
 **1.0.0**
 
diff --git a/crochet/_version.py b/crochet/_version.py
index c17e1cc..eafcca7 100644
--- a/crochet/_version.py
+++ b/crochet/_version.py
@@ -2,4 +2,4 @@
 Store version in its own module so we can access it from both setup.py and
 __init__.
 """
-__version__ = "1.0.0"
+__version__ = "1.1.0"