This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2gobroker. from c2a9dfb typo in changelog new f8acb9d fix-up for eaa336c4012348f564de492309efa96eecb1c8bf 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: x2gobroker/agent.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 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 f8acb9d28e2df5623d2cf451d79865372c5fcc43 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Mar 27 14:00:13 2015 +0100 fix-up for eaa336c4012348f564de492309efa96eecb1c8bf --- x2gobroker/agent.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/x2gobroker/agent.py b/x2gobroker/agent.py index eb6e888..92ed427 100644 --- a/x2gobroker/agent.py +++ b/x2gobroker/agent.py @@ -431,10 +431,10 @@ def checkload(remote_agent=None, logger=None, **kwargs): p[key] = float(val) load_factor = None - if p['memAvail'] == 0: - p['memAvail'] = p['myMemAvail'] - try: + if p['memAvail'] == 0: + p['memAvail'] = p['myMemAvail'] + load_factor = long( ( (p['memAvail']/1000) * p['numCPU'] * p['typeCPU'] * 100 ) / p['loadavgXX'] ) except KeyError: pass -- 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