[pypy-commit] pypy default: merged upstream

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r71239:f51149fdd0c2
Date: 2014-05-03 12:57 -0700
http://bitbucket.org/pypy/pypy/changeset/f51149fdd0c2/

Log:	merged upstream

diff --git a/pypy/doc/release-2.3.0.rst b/pypy/doc/release-2.3.0.rst
--- a/pypy/doc/release-2.3.0.rst
+++ b/pypy/doc/release-2.3.0.rst
@@ -87,6 +87,10 @@
 
 * Support for corner cases on objects with __int__ and __float__ methods
 
+* Fix multithreaded support for gethostbyname_ex and gethostbyaddr
+
+* Fix handling of tp_name for type objects
+
 .. _`HippyVM`: http://www.hippyvm.com
 
 New Platforms and Features
diff --git a/pypy/doc/whatsnew-2.3.0.rst b/pypy/doc/whatsnew-2.3.0.rst
--- a/pypy/doc/whatsnew-2.3.0.rst
+++ b/pypy/doc/whatsnew-2.3.0.rst
@@ -164,3 +164,6 @@
 
 .. branch: issue1430
 Add a lock for unsafe calls to gethostbyname and gethostbyaddr
+
+.. branch: fix-tpname
+Changes hacks surrounding W_TypeObject.name to match CPython's tp_name
diff --git a/pypy/doc/whatsnew-head.rst b/pypy/doc/whatsnew-head.rst
--- a/pypy/doc/whatsnew-head.rst
+++ b/pypy/doc/whatsnew-head.rst
@@ -3,7 +3,4 @@
 =======================
 
 .. this is a revision shortly after release-2.3.x
-.. startrev: 773fc6275c69
-
-.. branch: fix-tpname
-Changes hacks surrounding W_TypeObject.name to match CPython's tp_name
+.. startrev: ec864bd08d50