etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks
|binary
modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
| 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit ef3e3e3912fa2f015edf6f2eea8b0217bb7b9999
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Jul 29 13:19:16 2013 +0200
Adding the newly (6/28/13) issued certificate for accessing the pto calendar
(
mail.corp.redhat.com domain) to the rhq-ircbot keystore. This one should be valid until
6/28/15.
diff --git a/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks
b/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks
index 3d73cbc..431de7c 100644
Binary files a/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks and
b/etc/rhq-ircBot/src/main/resources/org/rhq/etc/ircbot/cacerts.jks differ
commit f9f495ce4c2c0419cd75ca47096c3af9644a3250
Author: Jirka Kremser <jkremser(a)redhat.com>
Date: Mon Jul 29 12:54:06 2013 +0200
Calling the right setter.
diff --git
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
index 7d861f1..049cf42 100644
---
a/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
+++
b/modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
@@ -310,7 +310,7 @@ public class StorageNodeManagerBean implements
StorageNodeManagerLocal, StorageN
if ((scheduleId = scheduleIdsMap.get(totalDiskUsedPercentageMetric)) != null)
{
StorageNodeLoadComposite.MeasurementAggregateWithUnits
totalDiskUsedPercentageAggregateWithUnits = getMeasurementAggregateWithUnits(
subject, scheduleId, MeasurementUnits.PERCENTAGE, beginTime,
endTime);
-
result.setDataDiskUsedPercentage(totalDiskUsedPercentageAggregateWithUnits);
+
result.setTotalDiskUsedPercentage(totalDiskUsedPercentageAggregateWithUnits);
}
if ((scheduleId = scheduleIdsMap.get(freeDiskToDataRatioMetric)) != null) {
MeasurementAggregate freeDiskToDataRatioAggregate =
measurementManager.getAggregate(subject,
@@ -754,4 +754,4 @@ public class StorageNodeManagerBean implements
StorageNodeManagerLocal, StorageN
return successResultFound;
}
-}
\ No newline at end of file
+}