X-Git-Url: http://git.onelab.eu/?p=monitor.git;a=blobdiff_plain;f=monitor%2Fwrapper%2FemailTxt.py;h=9a7fec3ce58feaab0a04a72e97aae323bd24b072;hp=cd3ab2a339baedd34951ae29ada232bf8d720b57;hb=3f4df5945bbfb4592a164d929cf22c31d5fba50e;hpb=c981221e1aa839c3ba3e2fd11d89abf830a2fc38 diff --git a/monitor/wrapper/emailTxt.py b/monitor/wrapper/emailTxt.py index cd3ab2a..9a7fec3 100644 --- a/monitor/wrapper/emailTxt.py +++ b/monitor/wrapper/emailTxt.py @@ -309,12 +309,12 @@ Thank you very much for your help, -- PlanetLab Central (support@planet-lab.org) """) - clear_penalty=("""MONTEST: All penalties cleared from site %(loginbase)s""", + clear_penalty=("""MONTEST: All privileges restored to site %(loginbase)s""", """ -This notice is to let you know that any penalties previously applied to your -site have been removed: %(penalty_level)s. +This notice is to let you know that any privileges previously reduced at your +site have been restored: %(penalty_level)s. -All privileges have been restored. You may create slices again, and if your +All privileges are restored. You may create slices again, and if your slices were disabled, please allow up to 30 minutes for them to return to enabled. @@ -330,10 +330,10 @@ Legend: 2+ - all existing slices will be disabled. """) - increase_penalty=("""MONTEST: Penalty increased for site %(loginbase)s""", + increase_penalty=("""MONTEST: Privilege reduced for site %(loginbase)s""", """ -This notice is to let you know that the penalty applied to your site has -increased: %(penalty_level)s. +This notice is to let you know that the privileges granted to your site as +a participating member of Planetlab have reduced: %(penalty_level)s. Your privileges will be reduced corresponding to the legend below. To restore these privileges, please return at least two machines to working