Merge branch 'master' into slaprunner

Conflicts: CHANGES.txt setup.py

Merge branch 'master' into slaprunner
Conflicts: CHANGES.txt setup.py
a17c7c92 · Cédric de Saint Martin · 5706e313 · 9ee3ad80 · a17c7c92 · a17c7c92
Commit a17c7c92 authored Jul 06, 2012 by Cédric de Saint Martin
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 146 additions and 38 deletions

CHANGES.txt CHANGES.txt +2 -2

setup.py setup.py +1 -1

slapos/monitor.py slapos/monitor.py +143 -35

No files found.
--- a/CHANGES.txt
+++ b/CHANGES.txt
-0.25 (unreleased)
+0.25 (2012-06-19)
 =================

- * No changes yet.
+ * slapmonitor is fully functional. [Mohamadou Mbengue]

 0.24 (2012-04-19)
 =================

--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os

-version = '0.25-dev'
+version = '0.26-dev'
 name = 'slapos.toolbox'
 long_description = open("README.txt").read() + "\n" + \
    open("CHANGES.txt").read() + "\n"

--- a/slapos/monitor.py
+++ b/slapos/monitor.py