summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CREDITS4
-rw-r--r--HISTORY.rst9
2 files changed, 13 insertions, 0 deletions
diff --git a/CREDITS b/CREDITS
index 896133cc..c3f630f9 100644
--- a/CREDITS
+++ b/CREDITS
@@ -276,3 +276,7 @@ I: 565
N: karthikrev
I: 568
+
+N: Bruno Binet
+E: bruno.binet@gmail.com
+I: 572
diff --git a/HISTORY.rst b/HISTORY.rst
index e053b8d5..b205c66d 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -1,5 +1,14 @@
Bug tracker at https://github.com/giampaolo/psutil/issues
+2.2.1 - 2015-02-02
+==================
+
+**Bug fixes**
+
+- #496: [Linux] fix "ValueError: ambiguos inode with multiple PIDs references"
+ (patch by Bruno Binet)
+
+
2.2.0 - 2015-01-06
==================