[Sblim-commit] Git: gather - Metric Data Gatherer branch, master, updated. 76ae836d38ca605daade069fbb5f5ec0ab304651

[Dave H. <hel...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gather - Metric Data Gatherer".

The branch, master has been updated
       via  76ae836d38ca605daade069fbb5f5ec0ab304651 (commit)
      from  544dde322302aea7e29ec4c82a3e1ad7cdcc56b8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 76ae836d38ca605daade069fbb5f5ec0ab304651
Author: Dave Heller <hel...@us...>
Date:   Mon Feb 10 15:04:44 2014 -0500

    Fixed #2723: repository reported error for GI on interval metric

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog |    6 ++++++
 NEWS      |    1 +
 mreposl.c |    3 ++-
 3 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23570ff..51d9a9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-02-10  Dave Heller <hel...@us...>
+
+	* NEWS, mreposl.c
+
+	Fixed #2723: repository reported error for GI on interval metric
+
 2014-02-09  Dave Heller <hel...@us...>
 
 	* NEWS, comms/rcctest.c, gatherctl.c, reposctl.c, util/mlog.c
diff --git a/NEWS b/NEWS
index dd93a1b..c46dfb3 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ Bugs fixed:
 - #2633 local FS metris calculated inconsitently 
 - #2664 no guest counter in /proc/stat on older kernels 
 - #2722 compile fails when -Werror=format-security flag is used
+- #2723 repository reported error for GI on interval metric
 
 Changes in Version 2.2.8
 ========================
diff --git a/mreposl.c b/mreposl.c
index eaa4609..a8396c5 100644
--- a/mreposl.c
+++ b/mreposl.c
@@ -211,7 +211,8 @@ static int _MetricRetrieveNoLock (COMMHEAP ch, int mid, LocalResourceId *resourc
     syslen = strlen(resource[k].lrid_system) + 1;
     first=NULL;
     mv[k]=NULL;
-    while(mrv && from <= mrv->mrv_value->mvTimeStamp) {
+    while (mrv && (from <= mrv->mrv_value->mvTimeStamp
+        || (maxnum == 2 && num[k] == 1))) { /* [bugs:#2723] */
       if (to >= mrv->mrv_value->mvTimeStamp) {
 	/* mark */
 	if (num[k] < maxnum) {


hooks/post-receive
-- 
gather - Metric Data Gatherer