45 lines
891 B
Diff
45 lines
891 B
Diff
From 62e1783764420f36cd270135decb00b324add7fe Mon Sep 17 00:00:00 2001
|
|
From: Giampaolo Rodola <g.rodola@gmail.com>
|
|
Date: Tue, 13 Feb 2018 00:31:59 +0100
|
|
Subject: [PATCH] #1216 - give credit to @hexaclock
|
|
|
|
---
|
|
CREDITS | 4 ++++
|
|
HISTORY.rst | 9 +++++++++
|
|
2 files changed, 13 insertions(+)
|
|
|
|
diff --git a/CREDITS b/CREDITS
|
|
index cf9ce493..798b36e3 100644
|
|
--- a/CREDITS
|
|
+++ b/CREDITS
|
|
@@ -515,3 +515,7 @@ I: 1167
|
|
N: janderbrain
|
|
W: https://github.com/janderbrain
|
|
I: 1169
|
|
+
|
|
+N: Dan Vinakovsky
|
|
+W: https://github.com/hexaclock
|
|
+I: 1216
|
|
diff --git a/HISTORY.rst b/HISTORY.rst
|
|
index dd813c5b..463860c2 100644
|
|
--- a/HISTORY.rst
|
|
+++ b/HISTORY.rst
|
|
@@ -1,5 +1,14 @@
|
|
*Bug tracker at https://github.com/giampaolo/psutil/issues*
|
|
|
|
+5.4.4
|
|
+=====
|
|
+
|
|
+XXXX-XX-XX
|
|
+
|
|
+**Bug fixes**
|
|
+
|
|
+- 1216_: fix compatibility with python 2.6 on Windows (patch by Dan Vinakovsky)
|
|
+
|
|
5.4.3
|
|
=====
|
|
|
|
--
|
|
2.39.0.windows.2
|
|
|