[Xymon-developer] SF.net SVN: xymon:[6654] branches/4.2.0

[<st...@us...>]

Revision: 6654
          http://xymon.svn.sourceforge.net/xymon/?rev=6654&view=rev
Author:   storner
Date:     2011-03-09 16:00:18 +0000 (Wed, 09 Mar 2011)

Log Message:
-----------
4.2.0: Revert changes 6306, 6362, 6363 done committed after 4.2.0 release

Modified Paths:
--------------
    branches/4.2.0/hobbitd/hobbitd.c
    branches/4.2.0/lib/timing.c
    branches/4.2.0/rpm/hobbit.spec
    branches/4.2.0/web/bb-hist.c

Modified: branches/4.2.0/hobbitd/hobbitd.c
===================================================================
--- branches/4.2.0/hobbitd/hobbitd.c	2011-03-08 21:50:46 UTC (rev 6653)
+++ branches/4.2.0/hobbitd/hobbitd.c	2011-03-09 16:00:18 UTC (rev 6654)
@@ -404,7 +404,7 @@
 			bufp = statsbuf + strlen(statsbuf);
 		}
 
-		bufp += sprintf(bufp, "\n\nLatest error messages:\n%s\n", errbuf);
+		bufp += sprintf(bufp, "\n\nLatest errormessages:\n%s\n", errbuf);
 	}
 
 	MEMUNDEFINE(bootuptxt);

Modified: branches/4.2.0/lib/timing.c
===================================================================
--- branches/4.2.0/lib/timing.c	2011-03-08 21:50:46 UTC (rev 6653)
+++ branches/4.2.0/lib/timing.c	2011-03-09 16:00:18 UTC (rev 6654)
@@ -70,7 +70,7 @@
 
 	strcpy(outbuf, "\n\nTIME SPENT\n");
 	strcat(outbuf, "Event                                   ");
-	strcat(outbuf, "        Start time");
+	strcat(outbuf, "         Starttime");
 	strcat(outbuf, "          Duration\n");
 
 	for (s=stamphead; (s); s=s->next) {

Modified: branches/4.2.0/rpm/hobbit.spec
===================================================================
--- branches/4.2.0/rpm/hobbit.spec	2011-03-08 21:50:46 UTC (rev 6653)
+++ branches/4.2.0/rpm/hobbit.spec	2011-03-09 16:00:18 UTC (rev 6654)
@@ -2,7 +2,7 @@
 Version: @VER@
 Release: 1
 Group: Networking/Daemons
-URL: http://xymon.sourceforge.net/
+URL: http://hobbitmon.sourceforge.net/
 License: GPL
 Source: hobbit-@VER@.tar.gz
 Source1: hobbit-init.d

Modified: branches/4.2.0/web/bb-hist.c
===================================================================
--- branches/4.2.0/web/bb-hist.c	2011-03-08 21:50:46 UTC (rev 6653)
+++ branches/4.2.0/web/bb-hist.c	2011-03-09 16:00:18 UTC (rev 6654)
@@ -491,19 +491,19 @@
 		      char *ip, 			/* IP - for the header only */
 		      time_t endtime,			/* End time of color-bar graphs */
 
-                      time_t start1d,			/* Start time of 1-day period */
+                      time_t start1d,			/* Starttime of 1-day period */
 		      reportinfo_t *repinfo1d, 		/* Percent summaries for 1-day period */
 		      replog_t *log1d, 			/* Events during past 1 day */
 
-                      time_t start1w,			/* Start time of 1-week period */
+                      time_t start1w,			/* Starttime of 1-week period */
 		      reportinfo_t *repinfo1w, 		/* Percent summaries for 1-week period */
 		      replog_t *log1w, 			/* Events during past 1 week */
 
-                      time_t start4w,			/* Start time of 4-week period */
+                      time_t start4w,			/* Starttime of 4-week period */
 		      reportinfo_t *repinfo4w, 		/* Percent summaries for 4-week period */
 		      replog_t *log4w, 			/* Events during past 4 weeks */
 
-                      time_t start1y,			/* Start time of 1-year period */
+                      time_t start1y,			/* Starttime of 1-year period */
 		      reportinfo_t *repinfo1y, 		/* Percent summaries for 1-year period */
 		      replog_t *log1y, 			/* Events during past 1 yeary */
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.