summaryrefslogtreecommitdiff
path: root/changes/bug-5309_psutil-version-conflict
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-03-17 14:32:46 -0300
committerTomás Touceda <chiiph@leap.se>2014-03-17 14:32:46 -0300
commit03b74407d4051e2c5dfb62b8e6e8899008030d26 (patch)
tree0eade76b8bec7a4f71af8de46be7cb4c42cedcd6 /changes/bug-5309_psutil-version-conflict
parentf78a694b283859e4eab306dffaa0373b9f6ea8ad (diff)
parent23d77edd4c748e9758b48b5297f8b3c899c5c156 (diff)
Merge remote-tracking branch 'refs/remotes/ivan/bug/5309_psutil-version-conflict' into develop
Diffstat (limited to 'changes/bug-5309_psutil-version-conflict')
-rw-r--r--changes/bug-5309_psutil-version-conflict1
1 files changed, 1 insertions, 0 deletions
diff --git a/changes/bug-5309_psutil-version-conflict b/changes/bug-5309_psutil-version-conflict
new file mode 100644
index 00000000..e7ccb2fc
--- /dev/null
+++ b/changes/bug-5309_psutil-version-conflict
@@ -0,0 +1 @@
+- Fix psutil version to avoid conflicts with gnupg required version. Closes #5309.