summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolargo <nicolas@nicolargo.com>2014-10-09 22:20:08 +0200
committerNicolargo <nicolas@nicolargo.com>2014-10-09 22:20:08 +0200
commit45b78474e464b88253071713794cd6d69a697890 (patch)
treeaa9932c8c4b79bda185cd3f2334cbe98e10ce225
parentaddca791d46587c0d65b4994d589a9f2db1101d8 (diff)
version 2.1.2
-rw-r--r--NEWS9
-rw-r--r--docs/glances-doc.html2
-rw-r--r--docs/glances-doc.rst2
-rw-r--r--glances/__init__.py2
-rw-r--r--glances/core/glances_standalone.py4
-rw-r--r--man/glances.12
-rwxr-xr-xsetup.py2
7 files changed, 16 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 01b911a8..f4055f2a 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,15 @@
Glances Version 2.x
==============================================================================
+Version 2.1.2
+=============
+
+ Maintenance version (only needed for Mac OS X).
+
+Bugs corrected:
+
+ * Mac OS X: Error if Glances is not ran with sudo (issue #426)
+
Version 2.1.1
=============
diff --git a/docs/glances-doc.html b/docs/glances-doc.html
index 719e69e3..32121e8c 100644
--- a/docs/glances-doc.html
+++ b/docs/glances-doc.html
@@ -123,7 +123,7 @@ td.option-group {
<div class="document" id="glances">
<h1 class="title">Glances</h1>
-<p>This manual describes <em>Glances</em> version 2.1.1.</p>
+<p>This manual describes <em>Glances</em> version 2.1.2.</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>October 2014</p>
<div class="contents topic" id="table-of-contents">
diff --git a/docs/glances-doc.rst b/docs/glances-doc.rst
index a2b1932e..db28942e 100644
--- a/docs/glances-doc.rst
+++ b/docs/glances-doc.rst
@@ -2,7 +2,7 @@
Glances
=======
-This manual describes *Glances* version 2.1.1.
+This manual describes *Glances* version 2.1.2.
Copyright © 2012-2014 Nicolas Hennion <nicolas@nicolargo.com>
diff --git a/glances/__init__.py b/glances/__init__.py
index 7c99560c..8d3b9b96 100644
--- a/glances/__init__.py
+++ b/glances/__init__.py
@@ -20,7 +20,7 @@
"""Init the Glances software."""
__appname__ = 'glances'
-__version__ = '2.1.2_BETA'
+__version__ = '2.1.2'
__author__ = 'Nicolas Hennion <nicolas@nicolargo.com>'
__license__ = 'LGPL'
diff --git a/glances/core/glances_standalone.py b/glances/core/glances_standalone.py
index 4fe860da..65ce03b5 100644
--- a/glances/core/glances_standalone.py
+++ b/glances/core/glances_standalone.py
@@ -34,8 +34,8 @@ class GlancesStandalone(object):
# Init stats
self.stats = GlancesStats(config=config, args=args)
- # Default number of processes to displayed is set to 20
- glances_processes.set_max_processes(20)
+ # Default number of processes to displayed is set to 50
+ glances_processes.set_max_processes(50)
# If process extended stats is disabled by user
if args.disable_process_extended:
diff --git a/man/glances.1 b/man/glances.1
index d8cd2951..57f9dbcd 100644
--- a/man/glances.1
+++ b/man/glances.1
@@ -1,4 +1,4 @@
-.TH glances 1 "October, 2014" "version 2.1.1" "USER COMMANDS"
+.TH glances 1 "October, 2014" "version 2.1.2" "USER COMMANDS"
.SH NAME
glances \- A cross-platform curses-based system monitoring tool
.SH SYNOPSIS
diff --git a/setup.py b/setup.py
index 9013a503..5261214a 100755
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ def get_requires():
setup(
name='Glances',
- version='2.1.1',
+ version='2.1.2',
description="A cross-platform curses-based monitoring tool",
long_description=open('README.rst').read(),
author='Nicolas Hennion',