summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Holder <ray@blacklocus.com>2014-08-25 19:38:17 -0500
committerRay Holder <ray@blacklocus.com>2014-08-25 19:38:17 -0500
commitfc88833dd769260ef4382914b9922da8980ee6c0 (patch)
tree9bf67f293c08add12db4561f45fef80f6fc750c8
parentce99e6ccd29e604bf0549d3de5cc495300e290d7 (diff)
parentd59d44624ac7b9afa9ecc949873fd29266dfde67 (diff)
downloadretrying-fc88833dd769260ef4382914b9922da8980ee6c0.tar.gz
Merge tag 'v1.2.3'
Release 1.2.3
-rw-r--r--AUTHORS.rst1
-rw-r--r--HISTORY.rst4
-rw-r--r--setup.py2
3 files changed, 6 insertions, 1 deletions
diff --git a/AUTHORS.rst b/AUTHORS.rst
index 744675b..4803ca4 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -18,3 +18,4 @@ Patches and Suggestions
- Simon Dollé
- Rees Dooley
- Saul Shanabrook
+- Daniel Nephin
diff --git a/HISTORY.rst b/HISTORY.rst
index d9bd4ed..ba89481 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -2,6 +2,10 @@
History
-------
+1.2.3 (2014-08-25)
+++++++++++++++++++
+- Add support for custom wait and stop functions
+
1.2.2 (2014-06-20)
++++++++++++++++++
- Bug fix to not raise a RetryError on failure when exceptions aren't being wrapped
diff --git a/setup.py b/setup.py
index 6e9c219..5c092b8 100644
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,7 @@ with open('HISTORY.rst') as file_history:
settings.update(
name='retrying',
- version='1.2.3-dev',
+ version='1.2.3',
description='Retrying',
long_description=readme + '\n\n' + history,
author='Ray Holder',