summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolargo <nicolas@nicolargo.com>2014-10-02 21:20:39 +0200
committerNicolargo <nicolas@nicolargo.com>2014-10-02 21:20:39 +0200
commitef158378d365c21ecb70f1c5eb76118101a98751 (patch)
tree73f08c02fb93c2aa49d59175cff2f970e6133733
parenta296f5cea9ce5c28eb7af66d1708bae492ccc8b1 (diff)
version 2.1.1
-rw-r--r--NEWS15
-rw-r--r--docs/glances-doc.html4
-rw-r--r--docs/glances-doc.rst4
-rw-r--r--glances/__init__.py2
-rw-r--r--man/glances.12
-rw-r--r--requirements.txt2
-rwxr-xr-xsetup.py4
7 files changed, 24 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index 0d17adf7..01b911a8 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,21 @@
Glances Version 2.x
==============================================================================
+Version 2.1.1
+=============
+
+Enhancement:
+ * Automaticaly compute top processes number for the current screen (issue #408)
+ * CPU and Memory footprint optimization (issue #401)
+
+Bugs corrected:
+
+ * Mac OS X 10.9: Exception at start (issue #423)
+ * Process no longer exists (issue #421)
+ * Error with Glances Client with Python 3.4.1 (issue #419)
+ * TypeError: memory_maps() takes exactly 2 arguments (issue #413)
+ * No filesystem informations since Glances 2.0 bug enhancement (issue #381)
+
Version 2.1
===========
diff --git a/docs/glances-doc.html b/docs/glances-doc.html
index 32501916..719e69e3 100644
--- a/docs/glances-doc.html
+++ b/docs/glances-doc.html
@@ -123,9 +123,9 @@ td.option-group {
<div class="document" id="glances">
<h1 class="title">Glances</h1>
-<p>This manual describes <em>Glances</em> version 2.1.</p>
+<p>This manual describes <em>Glances</em> version 2.1.1.</p>
<p>Copyright © 2012-2014 Nicolas Hennion &lt;<a class="reference external" href="mailto:nicolas&#64;nicolargo.com">nicolas&#64;nicolargo.com</a>&gt;</p>
-<p>September 2014</p>
+<p>October 2014</p>
<div class="contents topic" id="table-of-contents">
<p class="topic-title first">Table of Contents</p>
<ul class="simple">
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst
index 7f5f0b63..a2b1932e 100644
--- a/docs/glances-doc.rst
+++ b/docs/glances-doc.rst
@@ -2,11 +2,11 @@
Glances
=======
-This manual describes *Glances* version 2.1.
+This manual describes *Glances* version 2.1.1.
Copyright © 2012-2014 Nicolas Hennion <nicolas@nicolargo.com>
-September 2014
+October 2014
.. contents:: Table of Contents
diff --git a/glances/__init__.py b/glances/__init__.py
index 3fedb3d2..18b9743a 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -20,7 +20,7 @@
"""Init the Glances software."""
__appname__ = 'glances'
-__version__ = '2.1.1_BETA'
+__version__ = '2.1.1'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPL'
diff --git a/man/glances.1 b/man/glances.1
index c2389d83..d8cd2951 100644
--- a/man/glances.1
+++ b/man/glances.1
@@ -1,4 +1,4 @@
-.TH glances 1 "September, 2014" "version 2.1" "USER COMMANDS"
+.TH glances 1 "October, 2014" "version 2.1.1" "USER COMMANDS"
.SH NAME
glances \- A cross-platform curses-based system monitoring tool
.SH SYNOPSIS
diff --git a/requirements.txt b/requirements.txt
index b7a63a89..52546a76 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1 @@
-psutil==2.1.1
+psutil==2.1.3
diff --git a/setup.py b/setup.py
index 1ef63962..9013a503 100755
--- a/setup.py
+++ b/setup.py
@@ -40,13 +40,13 @@ def get_requires():
setup(
name='Glances',
- version='2.1',
+ version='2.1.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.1.tar.gz',
+ # download_url='https://s3.amazonaws.com/glances/glances-2.1.1.tar.gz',
license="LGPL",
keywords="cli curses monitoring system",
install_requires=get_requires(),