rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 2 +-
web/spacewalk-web.spec | 5 ++++-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 91f9859b536c61e570433cde39070b544aedcf3c
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Wed Dec 1 15:03:09 2010 +0100
Automatic commit of package [spacewalk-web] release [1.2.29-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 6056d59..2fd73a8 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.2.28-1 web/
+1.2.29-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index c45103c..07c7b84 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.28
+Version: 1.2.29
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Dec 01 2010 Lukas Zapletal 1.2.29-1
+- 658256 - Error 500 - ISE - when scheduling remote commands
+
* Thu Nov 25 2010 Lukas Zapletal 1.2.28-1
- Adding missing monitoring state (UNKNOWN)
commit 5acd110b749d0f948b8aca26935f7d8c434ff200
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Wed Dec 1 14:59:52 2010 +0100
658256 - Error 500 - ISE - when scheduling remote commands
(cherry picked from commit 5db2eedb1f8247360da182983dbf012dfd09e57b)
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index d330308..9ac2135 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -1033,7 +1033,7 @@ ORDER BY UPPER(NVL(S.name, '(none)')), S.id
( SELECT CASE
MAX(CASE PS.state WHEN 'OK' THEN 1 WHEN 'PENDING' THEN
2 WHEN 'UNKNOWN' THEN 3 WHEN 'WARNING' THEN 4 WHEN 'CRITICAL' THEN
5 END)
WHEN 1 THEN 'OK' WHEN 2 THEN 'PENDING' WHEN 3
THEN 'UNKNOWN' WHEN 4 THEN 'WARNING' WHEN 5 THEN 'CRITICAL' END
ST
- FROM rhn_probe_state PS
+ FROM rhn_probe_state PS, rhnServerOverview OV
LEFT OUTER JOIN rhn_check_probe CP ON OV.server_id = CP.host_id
WHERE PS.probe_id = CP.probe_id
GROUP BY OV.server_id ) MONITORING_STATUS,