cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From muralire...@apache.org
Subject git commit: updated refs/heads/master to d97345f
Date Tue, 03 Dec 2013 10:46:53 GMT
Updated Branches:
  refs/heads/master c39bc04be -> d97345f0a


fixing copy paste error in getting alert type in alert manager


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d97345f0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d97345f0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d97345f0

Branch: refs/heads/master
Commit: d97345f0a254be412fde2c7bc0fdc2969dd588dc
Parents: c39bc04
Author: Murali Reddy <muralimmreddy@gmail.com>
Authored: Tue Dec 3 16:14:26 2013 +0530
Committer: Murali Reddy <muralimmreddy@gmail.com>
Committed: Tue Dec 3 16:16:10 2013 +0530

----------------------------------------------------------------------
 server/src/com/cloud/alert/AlertManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d97345f0/server/src/com/cloud/alert/AlertManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/alert/AlertManagerImpl.java b/server/src/com/cloud/alert/AlertManagerImpl.java
index 05ed03a..fd24c02 100755
--- a/server/src/com/cloud/alert/AlertManagerImpl.java
+++ b/server/src/com/cloud/alert/AlertManagerImpl.java
@@ -262,7 +262,7 @@ public class AlertManagerImpl extends ManagerBase implements AlertManager,
Confi
         if (alertType == ALERT_TYPE_MEMORY) {
             return "ALERT.MEMORY";
         } else if (alertType == ALERT_TYPE_CPU) {
-            return "ALERT.MEMORY";
+            return "ALERT.CPU";
         } else if (alertType == ALERT_TYPE_STORAGE) {
             return "ALERT.STORAGE";
         } else if (alertType == ALERT_TYPE_STORAGE_ALLOCATED) {


Mime
View raw message