summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolargo <nicolashennion@gmail.com>2015-10-10 11:25:51 +0200
committernicolargo <nicolashennion@gmail.com>2015-10-10 11:25:51 +0200
commit6036eeaa687002ea21c76c9a4179aad8f6d6ea3e (patch)
treedc7d725ce3411ba4a3a2c2e683ccfe18c0112dc8
parent8696aba064d86c22d870b8262344d1d346ec950b (diff)
Patch 2.5.1v2.5.1
-rw-r--r--NEWS9
-rw-r--r--docs/glances-doc.rst4
-rw-r--r--glances/__init__.py2
-rw-r--r--man/glances.12
-rwxr-xr-xsetup.py4
5 files changed, 12 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index 1a934b18..cbbee262 100644
--- a/NEWS
+++ b/NEWS
@@ -2,11 +2,14 @@
Glances Version 2
==============================================================================
-Version 2.X
-===========
+Version 2.5.1
+=============
- ...
+Bugs corrected:
+ * Unable to unlock password protected servers in browser mode bug (issue #694)
+ * Correct issue when Glances is started in console on Windows OS
+ * [WebUI] when alert is ongoing hide level enhancement (issue #692)
Version 2.5
===========
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst
index bdadde92..b826cee0 100644
--- a/docs/glances-doc.rst
+++ b/docs/glances-doc.rst
@@ -2,11 +2,11 @@
Glances
=======
-This manual describes *Glances* version 2.5.
+This manual describes *Glances* version 2.5.1.
Copyright © 2011-2015 Nicolas Hennion <nicolas@nicolargo.com>
-September 2015
+October, 2015
.. contents:: Table of Contents
diff --git a/glances/__init__.py b/glances/__init__.py
index d27d6484..96467d73 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -20,7 +20,7 @@
"""Init the Glances software."""
__appname__ = 'glances'
-__version__ = '2.5'
+__version__ = '2.5.1'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPL'
diff --git a/man/glances.1 b/man/glances.1
index 8cbf2591..eeeab5fb 100644
--- a/man/glances.1
+++ b/man/glances.1
@@ -1,4 +1,4 @@
-.TH glances 1 "May, 2015" "version 2.4.2" "USER COMMANDS"
+.TH glances 1 "October, 2015" "version 2.5.1" "USER COMMANDS"
.SH NAME
glances \- A cross-platform curses-based system monitoring tool
.SH SYNOPSIS
diff --git a/setup.py b/setup.py
index a5f4705f..8cdd60ae 100755
--- a/setup.py
+++ b/setup.py
@@ -33,13 +33,13 @@ def get_requires():
setup(
name='Glances',
- version='2.5',
+ version='2.5.1',
description="A cross-platform curses-based monitoring tool",
long_description=open('README.rst').read(),
author='Nicolas Hennion',
author_email='nicolas@nicolargo.com',
url='https://github.com/nicolargo/glances',
- # download_url='https://s3.amazonaws.com/glances/glances-2.5.tar.gz',
+ # download_url='https://s3.amazonaws.com/glances/glances-2.5.1.tar.gz',
license="LGPL",
keywords="cli curses monitoring system",
install_requires=get_requires(),