summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2013-11-26 20:57:45 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2013-11-26 20:57:45 (GMT)
commit910b1c39931dd40a2aeddff101bb74f5f952b4bf (patch)
treeb69f22a1391cd8abc717cae42a378e82f865797d /Misc
parent29f8cb64e64cbbb3e5da7b280b78d37b58719070 (diff)
parent822963ed5d6150f901979fe9d61ef9026e4787a5 (diff)
downloadcpython-910b1c39931dd40a2aeddff101bb74f5f952b4bf.zip
cpython-910b1c39931dd40a2aeddff101bb74f5f952b4bf.tar.gz
cpython-910b1c39931dd40a2aeddff101bb74f5f952b4bf.tar.bz2
Merge heads
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS3
2 files changed, 4 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 36cbdd7..5e60f9b 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -407,6 +407,7 @@ John Fouhy
Andrew Francis
Stefan Franke
Martin Franklin
+Kent Frazier
Bruce Frederiksen
Robin Friedrich
Bradley Froehle
diff --git a/Misc/NEWS b/Misc/NEWS
index 28382f1..f7a98c3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,9 @@ Core and Builtins
Library
-------
+- Issue #11508: Fixed uuid.getnode() and uuid.uuid1() on environment with
+ virtual interface. Original patch by Kent Frazier.
+
- Issue #11489: JSON decoder now accepts lone surrogates.
- Issue #19545: Avoid chained exceptions while passing stray % to