summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2013-11-26 20:57:10 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2013-11-26 20:57:10 (GMT)
commit99fb0513ddf8b0315ed717d08ced1fa28d144f05 (patch)
tree682abc19c49b58468f5168b70ddb120601eff164 /Misc
parenta6edea530bb9f3a9ff6234f443ea5d00428a7635 (diff)
parent56507c7862b6e2de189b6a942f394efb676cdb0b (diff)
downloadcpython-99fb0513ddf8b0315ed717d08ced1fa28d144f05.zip
cpython-99fb0513ddf8b0315ed717d08ced1fa28d144f05.tar.gz
cpython-99fb0513ddf8b0315ed717d08ced1fa28d144f05.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 39b0f70..2c957e3 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -394,6 +394,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 f488230..3a331e8 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