java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml | 15 +++++-----
java/spacewalk-java.spec | 6 +++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 14 insertions(+), 9 deletions(-)
New commits:
commit 69d1d11272a11a7e1318339858c847aaa2cfda75
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Sep 23 13:21:04 2010 +0200
Automatic commit of package [spacewalk-java] release [1.2.44-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index ca770e4..a349d3f 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.43
+Version: 1.2.44
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -336,6 +336,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Sep 23 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.2.44-1
+- fixed erratamailer_fill_work_queue
+- resource spelling script and several typo corrections
+
* Thu Sep 23 2010 Lukas Zapletal 1.2.43-1
- 636740 - asterisks in package search fixed
- 636120 - fixed an ISE in the org.listSystemEntitlements call to deal with null
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 64b484a..aca21da 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.43-1 java/
+1.2.44-1 java/
commit 3a72457a8e5f5e7262b0376ed8682a122621c418
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Sep 22 22:32:41 2010 +0200
indented to match sql convention
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index 4cd18a5..e62234c 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -374,13 +374,14 @@ ORDER BY next_action DESC
INSERT INTO rhnPaidErrataTempCache
(user_id, server_id, errata_id)
SELECT urn.user_id, snv.server_id, snv.errata_id
- FROM rhnServerNeededCache snv inner join
- rhnUserReceiveNotifications urn ON snv.server_id = urn.server_id
- inner join
- rhnServerChannel sc on sc.server_id = snv.server_id
- WHERE sc.channel_id = :channel_id
- AND snv.errata_id = :errata_id
- AND S.org_id = :org_id
+ FROM rhnServerNeededCache snv
+ JOIN rhnUserReceiveNotifications urn
+ ON snv.server_id = urn.server_id
+ JOIN rhnServerChannel sc
+ ON sc.server_id = snv.server_id
+ WHERE sc.channel_id = :channel_id
+ AND snv.errata_id = :errata_id
+ AND S.org_id = :org_id
</query>
</write-mode>
commit 9f09cf8bb9854c9f8bc6f4e497a49abec3affee2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Sep 22 22:30:32 2010 +0200
rhnServer is redundant here
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
index 9f48fdd..4cd18a5 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Task_queries.xml
@@ -376,8 +376,8 @@ ORDER BY next_action DESC
SELECT urn.user_id, snv.server_id, snv.errata_id
FROM rhnServerNeededCache snv inner join
rhnUserReceiveNotifications urn ON snv.server_id = urn.server_id
- inner join rhnServer S on S.id = snv.server_id inner join
- rhnServerChannel sc on sc.server_id = S.id
+ inner join
+ rhnServerChannel sc on sc.server_id = snv.server_id
WHERE sc.channel_id = :channel_id
AND snv.errata_id = :errata_id
AND S.org_id = :org_id