summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolashennion@gmail.com>2016-03-16 17:41:07 +0100
committernicolargo <nicolashennion@gmail.com>2016-03-16 17:41:07 +0100
commit278add2bcfe77d6d1bf89c8ad9ddf2c0e690f41d (patch)
tree85bb2f90eccb5fa1fc2132d55a3912d2d73746c6
parent807ea3262b6ab25b0fd87c9039bf1eb055fc35a5 (diff)
Update PSUtil req to 4.1.0 / Ready to tag 2.6
-rw-r--r--docs/man/glances.12
-rw-r--r--glances/__init__.py2
-rw-r--r--requirements.txt2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/man/glances.1 b/docs/man/glances.1
index 076a43d9..0018d8a1 100644
--- a/docs/man/glances.1
+++ b/docs/man/glances.1
@@ -1,6 +1,6 @@
.\" Man page generated from reStructuredText.
.
-.TH "GLANCES" "1" "March 13, 2016" "2.6_RC1" "Glances"
+.TH "GLANCES" "1" "March 16, 2016" "2.6" "Glances"
.SH NAME
glances \- An eye on your system
.
diff --git a/glances/__init__.py b/glances/__init__.py
index 8187f67d..c937e820 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -27,7 +27,7 @@ import sys
# Global name
__appname__ = 'glances'
-__version__ = '2.6_RC1'
+__version__ = '2.6'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPL'
diff --git a/requirements.txt b/requirements.txt
index 0c93b28d..60d3a2b7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-psutil==4.0.0
+psutil==4.1.0