Merge tag 'v2.1.2' into develop

Version 2.1.2
This commit is contained in:
Nicolargo 2014-10-09 22:21:36 +02:00
commit 4acdcfb368
7 changed files with 16 additions and 7 deletions

9
NEWS
View File

@ -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
=============

View File

@ -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">

View File

@ -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>

View File

@ -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'

View File

@ -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:

View File

@ -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

View File

@ -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',