4 commits - java/code java/spacewalk-java.spec search-server/spacewalk-search

Tomas Lestach tlestach at fedoraproject.org
Thu Jun 28 10:04:02 UTC 2012


 java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java |    1 -
 java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java     |    1 +
 java/spacewalk-java.spec                                                                  |    1 +
 search-server/spacewalk-search/spacewalk-search.spec                                      |    3 ++-
 4 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 2d28b81e605d0cca0db0dda5f2e82f9a049e9502
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Thu Jun 28 11:55:18 2012 +0200

    795565 - add API doc for channel.software.listErrata update_date attribute

diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java
index f524a65..744e711 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ErrataOverviewSerializer.java
@@ -32,6 +32,7 @@ import redstone.xmlrpc.XmlRpcSerializer;
  *     #struct("errata")
  *          #prop_desc("int", "id", "Errata ID.")
  *          #prop_desc("string", "date", "Date erratum was created.")
+ *          #prop_desc("string", "update_date", "Date erratum was updated.");
  *          #prop_desc("string", "advisory_synopsis", "Summary of the erratum.")
  *          #prop_desc("string", "advisory_type", "Type label such as Security, Bug Fix")
  *          #prop_desc("string", "advisory_name", "Name such as RHSA, etc")


commit 3194f427898335051fb08a26d6751d99c3476bba
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Thu Jun 28 11:34:59 2012 +0200

    795565 - remove "date" from the channel.software.listErrata API doc

diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
index e66afd5..b108f00 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/channel/software/ChannelSoftwareHandler.java
@@ -1569,7 +1569,6 @@ public class ChannelSoftwareHandler extends BaseHandler {
      *    #array()
      *      #struct("errata")
      *        #prop_desc("int", "id", "Errata Id")
-     *        #prop_desc("string", "date", "Date erratum was created.")
      *        #prop_desc("string", "advisory_synopsis", "Summary of the erratum.")
      *        #prop_desc("string", "advisory_type", "Type label such as Security, Bug Fix")
      *        #prop_desc("string", "advisory_name", "Name such as RHSA, etc")


commit 20fda2b4b2cd4bc9df288abd38eda1fedf0af95c
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Thu Jun 28 11:33:30 2012 +0200

    search needs quartz < 2.0 as well

diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec
index 0e501a8..82fe9d4 100644
--- a/search-server/spacewalk-search/spacewalk-search.spec
+++ b/search-server/spacewalk-search/spacewalk-search.spec
@@ -35,7 +35,8 @@ Requires: jakarta-oro
 Requires: oro
 %endif
 #Requires: lucene
-Requires: quartz
+Requires: quartz < 2.0
+Conflicts: quartz >= 2.0
 Requires: redstone-xmlrpc
 #Requires: picocontainer
 Requires: tanukiwrapper


commit 01830913ac7598ea079ef2b11eec2c5e100f54c1
Author: Tomas Lestach <tlestach at redhat.com>
Date:   Thu Jun 28 10:46:42 2012 +0200

    adding conflicts for quartz >= 2.0

diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4892b5a..46cb3da 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -292,6 +292,7 @@ Requires: spacewalk-java-lib
 Requires: spacewalk-java-jdbc
 Requires: concurrent
 Requires: quartz < 2.0
+Conflicts: quartz >= 2.0
 Requires: cobbler >= 2.0.0
 Obsoletes: taskomatic < 5.3.0
 Obsoletes: taskomatic-sat < 5.3.0




More information about the spacewalk-commits mailing list