This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from eaa336c Calculate our own MemAvailable value in x2gobroker-agent.pl. Only kernels new than v3.14 offer the MemAvailable: field in /proc/meminfo. new 9ca763b x2gobroker-agent.pl: Fix regexp for detecting number of CPUs and CPU frequency. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 2 ++ lib/x2gobroker-agent.pl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2gobroker. commit 9ca763b5e5c0714ccb583be846bb6e54297c03eb Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 27 12:15:34 2015 +0100 x2gobroker-agent.pl: Fix regexp for detecting number of CPUs and CPU frequency. --- debian/changelog | 2 ++ lib/x2gobroker-agent.pl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9d8ae6b..0d6c7c4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -252,6 +252,8 @@ x2gobroker (0.0.3.0-0x2go1) UNRELEASED; urgency=low - agent.py: Set result to None, if SSH connection to broker agent fails. - Calculate our own MemAvailable value in x2gobroker-agent.pl. Only kernels new than v3.14 offer the MemAvailable: field in /proc/meminfo. + - x2gobroker-agent.pl: Fix regexp for detecting number of CPUs and CPU + frequency. * debian/control: + Provide separate bin:package for SSH brokerage: x2gobroker-ssh. + Replace LDAP support with session brokerage support in LONG_DESCRIPTION. diff --git a/lib/x2gobroker-agent.pl b/lib/x2gobroker-agent.pl index 27709f1..4926cce 100755 --- a/lib/x2gobroker-agent.pl +++ b/lib/x2gobroker-agent.pl @@ -201,7 +201,7 @@ if ( $mode eq 'checkload' ) { my $typeCPU; open FILE, "< /proc/cpuinfo" or die return ("Cannot open /proc/cpuinfo: $!"); foreach(<FILE>) { - if ( m/model name.*CPU\ \@\ ([\d\.]+)/ ) { + if ( m/model name.*CPU.*@\ ([\d\.]+)/ ) { $typeCPU = $1*1000; $numCPU += 1; } -- Alioth's /srv/git/code.x2go.org/x2gobroker.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2gobroker.git
-
git-admin＠x2go.org