summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2019-04-05 12:44:48 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2019-04-05 12:44:48 +0200
commitd4cbce0b3aa7e72deb7409a25850cdd5c3c4d323 (patch)
tree5b5caa729c7b791aea095383f742b8050bd82a29
parent0716da1da363236e85dd8e49deb74818cdab0dba (diff)
downloadpsutil-d4cbce0b3aa7e72deb7409a25850cdd5c3c4d323.tar.gz
give CREDITS for #1480
-rw-r--r--CREDITS4
-rw-r--r--HISTORY.rst2
2 files changed, 6 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 9b7702f9..33c62ea6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -603,3 +603,7 @@ I: 1470
N: Daniel Beer
W: https://github.com/dbeer1
I: 1471
+
+N: Samer Masterson
+W: https://github.com/samertm
+I: 1480
diff --git a/HISTORY.rst b/HISTORY.rst
index 1c745b8b..65629f84 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -29,6 +29,8 @@
in WindowsError being raised instead of AccessDenied.
- 1477_: [Windows] wrong or absent error handling for private NTSTATUS Windows
APIs. Different process methods were affected by this.
+- 1480_: [Windows] psutil.cpu_count(logical=False) could cause a crash due to
+ fixed read violation. (patch by Samer Masterson)
5.6.1
=====