give CREDITs to @nikhilm for #1278

giampaolo · Jun 15, 2018 · d20b993 · d20b993
1 parent 179e640
commit d20b993
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/CREDITS b/CREDITS
@@ -539,3 +539,7 @@ I: 1260
 N: Jean-Luc Migot
 W: https://github.com/jmigot-tehtris
 I: 1258, 1289
+
+N: Nikhil Marathe
+W: https://github.com/nikhilm
+I: 1278
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -9,6 +9,8 @@ XXXX-XX-XX
 
 - 1209_: [OSX] Process.memory_maps() may fail with EINVAL due to poor
   task_for_pid() syscall. AccessDenied is now raised instead.
+- 1278_: [OSX] Process.threads() incorrectly return microseconds instead of
+  seconds. (patch by Nikhil Marathe)
 
 5.4.6
 =====