From b4fb7c414aca7c0bf59fefe23508574b366fb4ed Mon Sep 17 00:00:00 2001
From: Thomas Kluyver <thomas@kluyver.me.uk>
Date: Sun, 21 Aug 2016 21:10:04 +0100
Subject: Prepare to release 4.2.1

---
 doc/conf.py         | 2 +-
 doc/history.rst     | 7 +++++++
 pexpect/__init__.py | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index f3de534..cda9f5d 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -54,7 +54,7 @@ copyright = u'2013, Noah Spurrier and contributors'
 # The short X.Y version.
 version = '4.2'
 # The full version, including alpha/beta/rc tags.
-release = '4.2.0'
+release = '4.2.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/doc/history.rst b/doc/history.rst
index f90d515..bf38894 100644
--- a/doc/history.rst
+++ b/doc/history.rst
@@ -4,6 +4,13 @@ History
 Releases
 --------
 
+Version 4.2.1
+`````````````
+
+* Fix to allow running ``env`` in replwrap-ed bash.
+* Raise more informative exception from pxssh if it fails to connect.
+* Change ``passmass`` example to not log passwords entered.
+
 Version 4.2
 ```````````
 
diff --git a/pexpect/__init__.py b/pexpect/__init__.py
index 045fe36..6c509e6 100644
--- a/pexpect/__init__.py
+++ b/pexpect/__init__.py
@@ -75,7 +75,7 @@ if sys.platform != 'win32':
     from .pty_spawn import spawn, spawnu
     from .run import run, runu
 
-__version__ = '4.2.0'
+__version__ = '4.2.1'
 __revision__ = ''
 __all__ = ['ExceptionPexpect', 'EOF', 'TIMEOUT', 'spawn', 'spawnu', 'run', 'runu',
            'which', 'split_command_line', '__version__', '__revision__']
-- 
cgit v1.2.1