java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 849b1ce6e431b712ef8e2f9e235af7d26d0eb5b9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Feb 22 17:18:04 2013 +0100
fixed API doc for system.listLatestUpgradablePackages and
system.listLatestInstallablePackages API calls
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 4ebd5ec..e7ec382 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -1117,6 +1117,7 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("int", "serverId")
* @xmlrpc.returntype
+ * #array()
* #struct("package")
* #prop("string", "name")
* #prop("string", "arch")
@@ -1128,6 +1129,7 @@ public class SystemHandler extends BaseHandler {
* #prop("string", "to_epoch")
* #prop("string", "to_package_id")
* #struct_end()
+ * #array_end()
*/
public Object[] listLatestUpgradablePackages(String sessionKey, Integer sid)
throws FaultException {
@@ -1181,6 +1183,7 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("int", "serverId")
* @xmlrpc.returntype
+ * #array()
* #struct("package")
* #prop("string", "name")
* #prop("string", "version")
@@ -1189,6 +1192,7 @@ public class SystemHandler extends BaseHandler {
* #prop("int", "id")
* #prop("string", "arch_label")
* #struct_end()
+ * #array_end()
*/
public Object[] listLatestInstallablePackages(String sessionKey, Integer sid)
throws FaultException {
11 years, 3 months
Changes to 'refs/tags/spacewalk-admin-1.9.8-1'
by Michael Mraka
Tag 'spacewalk-admin-1.9.8-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-02-22 13:44 +0000
Tagging package [spacewalk-admin] version [1.9.8-1] in directory [spacewalk/admin/].
Changes since spacewalk-utils-1.9.15-1:
Johannes Renner (1):
Fix nasty typo throughout translation files
Michael Mraka (2):
wait both for application and administration port to be ready
Automatic commit of package [spacewalk-admin] release [1.9.8-1].
---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 ++--
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/spacewalk-admin.spec | 5 ++++-
spacewalk/admin/spacewalk-startup-helper | 7 +++++--
14 files changed, 32 insertions(+), 26 deletions(-)
---
11 years, 3 months
2 commits - rel-eng/packages spacewalk/admin
by Michael Mraka
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/spacewalk-admin.spec | 5 ++++-
spacewalk/admin/spacewalk-startup-helper | 7 +++++--
3 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit ba708b7a4befdeed792ac7aa5eed39bb51d992e2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 22 14:44:10 2013 +0100
Automatic commit of package [spacewalk-admin] release [1.9.8-1].
diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-admin
index 2d835d3..268c4ad 100644
--- a/rel-eng/packages/spacewalk-admin
+++ b/rel-eng/packages/spacewalk-admin
@@ -1 +1 @@
-1.9.7-1 spacewalk/admin/
+1.9.8-1 spacewalk/admin/
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index d66a509..6807f96 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -2,7 +2,7 @@
Summary: Various utility scripts and data files for RHN Satellite installations
Name: spacewalk-admin
URL: https://fedorahosted.org/spacewalk
-Version: 1.9.7
+Version: 1.9.8
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: GPLv2
@@ -87,6 +87,9 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Fri Feb 22 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.8-1
+- wait both for application and administration port to be ready
+
* Tue Feb 19 2013 Jan Pazdziora 1.9.7-1
- The ensure-httpd-down will sleep in the loop, no need to have it in the main
script.
commit b733c2f83c3921b49cc916e6924d427e5d67a9a5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Feb 22 14:43:18 2013 +0100
wait both for application and administration port to be ready
diff --git a/spacewalk/admin/spacewalk-startup-helper b/spacewalk/admin/spacewalk-startup-helper
index 8c46769..a76d8c7 100755
--- a/spacewalk/admin/spacewalk-startup-helper
+++ b/spacewalk/admin/spacewalk-startup-helper
@@ -24,8 +24,11 @@ fi
if /usr/sbin/lsof /proc > /dev/null ; then
echo "Waiting for tomcat to be ready ..."
- while [ -f "/var/run/$TOMCAT.pid" ] ; do
- /usr/sbin/lsof -t -i TCP:8009 -p $(cat /var/run/$TOMCAT.pid) > /dev/null && break
+ TOMCAT_PID=$(cat /var/run/$TOMCAT.pid 2>/dev/null)
+ while [ -n "$TOMCAT_PID" ] ; do
+ /usr/sbin/lsof -t -i TCP:8005 -p $TOMCAT_PID > /dev/null \
+ && /usr/sbin/lsof -t -i TCP:8009 -p $TOMCAT_PID > /dev/null \
+ && break
sleep 1
done
else
11 years, 3 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 4 ++--
11 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit dc709828eae73187b1d98931bf1dc9b2f2a97b30
Author: Johannes Renner <jrenner(a)suse.de>
Date: Thu Feb 21 13:34:25 2013 +0100
Fix nasty typo throughout translation files
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
index 8fc9e78..941800b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml
@@ -25268,7 +25268,7 @@ für einen angegebenen Channel aufgelistet wird.</target>
<target>Plan für einfachen Durchlauf</target>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -25394,7 +25394,7 @@ für einen angegebenen Channel aufgelistet wird.</target>
<target>Es stehen keine Durchläufe zur Verfügung.</target>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 39c490d..806b832 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -18814,7 +18814,7 @@ given channel.</source>
</context-group>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -18922,7 +18922,7 @@ given channel.</source>
</context-group>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
index 0100884..2144541 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml
@@ -25264,7 +25264,7 @@ given channel.</source>
<target>Programación de ejecución simple</target>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -25390,7 +25390,7 @@ given channel.</source>
<target>No hay ejecuciones disponibles.</target>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
index c4391be..fe33287 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml
@@ -25263,7 +25263,7 @@ Les nom et une étiquette de canal sont requis. Ils doivent être au moins de 6
<target>Programmation d'exécution unique</target>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -25389,7 +25389,7 @@ Les nom et une étiquette de canal sont requis. Ils doivent être au moins de 6
<target>Aucune exécution disponible.</target>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
index c3975c7..09a1e9a 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml
@@ -25175,7 +25175,7 @@ Sono necessari sia l'etichetta che il nome del canale. Essi devono avere almeno
<target>Programmazione esecuzione singola</target>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -25301,7 +25301,7 @@ Sono necessari sia l'etichetta che il nome del canale. Essi devono avere almeno
<target>Non è disponibile alcuna esecuzione.</target>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
index af1fcb9..c63d9fd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml
@@ -25237,7 +25237,7 @@ given channel.</source>
<target>1 回のみの実行スケジュール</target>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -25363,7 +25363,7 @@ given channel.</source>
<target>利用できる実行はありません。</target>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
index 545f229..32901ce 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml
@@ -25229,7 +25229,7 @@ sha1은 클라이언트와의 폭넓은 호환성을 제공합니다. sha-256은
<target>단일 실행 스케줄 </target>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -25355,7 +25355,7 @@ sha1은 클라이언트와의 폭넓은 호환성을 제공합니다. sha-256은
<target>사용 가능한 실행이 없습니다.</target>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
index 2df536d..f8aeeb1 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml
@@ -25263,7 +25263,7 @@ given channel.</source>
<target>Agenda de Execução Única</target>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -25389,7 +25389,7 @@ given channel.</source>
<target>Não existe nenhuma execução disponível.</target>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
index 13e3bd8..1acb4d7 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml
@@ -25229,7 +25229,7 @@ given channel.</source>
<target>Назначить один прогон</target>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -25355,7 +25355,7 @@ given channel.</source>
<target>Нет прогонов.</target>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
index e02df0f..39598d3 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml
@@ -25249,7 +25249,7 @@ given channel.</source>
<target>单一运行调度</target>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -25375,7 +25375,7 @@ given channel.</source>
<target>没有运行可用。</target>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
index 9920454..c278cbd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml
@@ -25257,7 +25257,7 @@ given channel.</source>
<target>單執行排程</target>
</trans-unit>
<trans-unit id="bunch.jsp.generaldescription">
- <source>Bellow is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
+ <source>Below is the list of runs of the specific bunch type. Several tasks may be run within a bunch in a predefined order. It's possible to see the schedule the task was scheduled within by following the start time link. A single run of the bunch may be scheduled here.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/BunchDetail.do</context>
</context-group>
@@ -25383,7 +25383,7 @@ given channel.</source>
<target>沒有可用執行。</target>
</trans-unit>
<trans-unit id="schedules.jsp.introparagraph">
- <source>Bellow is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
+ <source>Below is a list of defined schedules. A schedule defines frequency, how often a predefined bunch shall be triggered.</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/admin/SatSchedules.do</context>
</context-group>
11 years, 3 months
Changes to 'refs/tags/spacewalk-utils-1.9.15-1'
by Michael Mraka
Tag 'spacewalk-utils-1.9.15-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-02-21 15:05 +0000
Tagging package [spacewalk-utils] version [1.9.15-1] in directory [utils/].
Changes since cobbler20-2.0.11-14:
Michael Mraka (2):
fixed koji build
Automatic commit of package [spacewalk-utils] release [1.9.15-1].
---
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 3 months
2 commits - rel-eng/packages utils/spacewalk-utils.spec
by Michael Mraka
rel-eng/packages/spacewalk-utils | 2 +-
utils/spacewalk-utils.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 64a3300e63ed90a1b47fdfd097e3fd385aafa64b
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 21 16:05:08 2013 +0100
Automatic commit of package [spacewalk-utils] release [1.9.15-1].
diff --git a/rel-eng/packages/spacewalk-utils b/rel-eng/packages/spacewalk-utils
index 894a498..967e5c1 100644
--- a/rel-eng/packages/spacewalk-utils
+++ b/rel-eng/packages/spacewalk-utils
@@ -1 +1 @@
-1.9.14-1 utils/
+1.9.15-1 utils/
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index bd7e828..3b41e48 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -1,7 +1,7 @@
%define rhnroot %{_prefix}/share/rhn
Name: spacewalk-utils
-Version: 1.9.14
+Version: 1.9.15
Release: 1%{?dist}
Summary: Utilities that may be run against a Spacewalk server.
@@ -88,6 +88,9 @@ spacewalk-pylint $RPM_BUILD_ROOT%{rhnroot}
%changelog
+* Thu Feb 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.15-1
+- fixed koji build
+
* Mon Feb 18 2013 Miroslav Suchý <msuchy(a)redhat.com> 1.9.14-1
- Buildrequire pod2man
commit b65b122676f2563b8bf7c086d9e9ebffbf0bb8f2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 21 16:02:00 2013 +0100
fixed koji build
diff --git a/utils/spacewalk-utils.spec b/utils/spacewalk-utils.spec
index c700e00..bd7e828 100644
--- a/utils/spacewalk-utils.spec
+++ b/utils/spacewalk-utils.spec
@@ -20,6 +20,7 @@ BuildRequires: /usr/bin/pod2man
# pylint check
BuildRequires: spacewalk-pylint
BuildRequires: yum
+BuildRequires: spacewalk-config
BuildRequires: spacewalk-backend >= 1.7.24
BuildRequires: spacewalk-backend-libs >= 1.7.24
BuildRequires: spacewalk-backend-tools >= 1.7.24
11 years, 3 months
Changes to 'refs/tags/cobbler20-2.0.11-14'
by Tomas Lestach
Tag 'cobbler20-2.0.11-14' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-02-21 14:25 +0000
Tagging package [cobbler20] version [2.0.11-14] in directory [spec-tree/cobbler20/].
Changes since spacewalk-proxy-installer-1.9.2-1:
Tomas Lestach (2):
768451 - lvm storage koan fix
Automatic commit of package [cobbler20] minor release [2.0.11-14].
---
rel-eng/packages/cobbler20 | 2 +-
spec-tree/cobbler20/cobbler20.spec | 7 ++++++-
spec-tree/cobbler20/lvm_storage.patch | 12 ++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
---
11 years, 3 months
2 commits - rel-eng/packages spec-tree/cobbler20
by Tomas Lestach
rel-eng/packages/cobbler20 | 2 +-
spec-tree/cobbler20/cobbler20.spec | 7 ++++++-
spec-tree/cobbler20/lvm_storage.patch | 12 ++++++++++++
3 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 9d16493a920391061c7f469ad824a8f68876957b
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 21 15:25:33 2013 +0100
Automatic commit of package [cobbler20] minor release [2.0.11-14].
diff --git a/rel-eng/packages/cobbler20 b/rel-eng/packages/cobbler20
index c2b3a77..505c3af 100644
--- a/rel-eng/packages/cobbler20
+++ b/rel-eng/packages/cobbler20
@@ -1 +1 @@
-2.0.11-13 spec-tree/cobbler20/
+2.0.11-14 spec-tree/cobbler20/
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index fbb81fb..8f4dbc7 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -7,7 +7,7 @@ Name: cobbler20
License: GPLv2+
AutoReq: no
Version: 2.0.11
-Release: 13%{?dist}
+Release: 14%{?dist}
Source0: cobbler-%{version}.tar.gz
Source1: cobblerd.service
Patch0: catch_cheetah_exception.patch
@@ -448,6 +448,9 @@ Web interface for Cobbler that allows visiting http://server/cobbler_web to conf
%doc AUTHORS COPYING CHANGELOG README
%changelog
+* Thu Feb 21 2013 Tomas Lestach <tlestach(a)redhat.com> 2.0.11-14
+- 768451 - lvm storage koan fix
+
* Mon Feb 18 2013 Michael Mraka <michael.mraka(a)redhat.com> 2.0.11-13
- update tftp dependency for systemd
commit a4cbff6599f3606e7791fd969144c2f61d1d675d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Feb 21 14:10:02 2013 +0100
768451 - lvm storage koan fix
diff --git a/spec-tree/cobbler20/cobbler20.spec b/spec-tree/cobbler20/cobbler20.spec
index 9ade149..fbb81fb 100644
--- a/spec-tree/cobbler20/cobbler20.spec
+++ b/spec-tree/cobbler20/cobbler20.spec
@@ -11,6 +11,7 @@ Release: 13%{?dist}
Source0: cobbler-%{version}.tar.gz
Source1: cobblerd.service
Patch0: catch_cheetah_exception.patch
+Patch1: lvm_storage.patch
Group: Applications/System
Requires: python >= 2.3
@@ -93,6 +94,7 @@ a XMLRPC API for integration with other applications.
%prep
%setup -q -n cobbler-%{version}
%patch0 -p1
+%patch1 -p1
%build
%{__python} setup.py build
diff --git a/spec-tree/cobbler20/lvm_storage.patch b/spec-tree/cobbler20/lvm_storage.patch
new file mode 100644
index 0000000..03952b3
--- /dev/null
+++ b/spec-tree/cobbler20/lvm_storage.patch
@@ -0,0 +1,12 @@
+diff -ru cobbler-2.0.11.orig/koan/app.py cobbler-2.0.11/koan/app.py
+--- cobbler-2.0.11.orig/koan/app.py 2013-02-21 14:04:29.353417463 +0100
++++ cobbler-2.0.11/koan/app.py 2013-02-21 14:06:04.517743333 +0100
+@@ -1515,7 +1515,7 @@
+ raise InfoException, "LVM creation failed"
+
+ # partition location
+- partition_location = "/dev/mapper/%s-%s" % (location,name.replace('-','--'))
++ partition_location = "/dev/%s/%s" % (location,name)
+
+ # check whether we have SELinux enabled system
+ args = "/usr/sbin/selinuxenabled"
11 years, 3 months
Changes to 'refs/tags/spacewalk-proxy-installer-1.9.2-1'
by Michael Mraka
Tag 'spacewalk-proxy-installer-1.9.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-02-21 13:06 +0000
Tagging package [spacewalk-proxy-installer] version [1.9.2-1] in directory [proxy/installer/].
Changes since spacewalk-backend-1.9.33-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-proxy-installer] release [1.9.2-1].
---
proxy/installer/spacewalk-proxy-installer.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 3 months
proxy/installer rel-eng/packages
by Michael Mraka
proxy/installer/spacewalk-proxy-installer.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit fbdc7f6116521282ce64f5d88ae0c393cbc23afb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu Feb 21 14:06:16 2013 +0100
Automatic commit of package [spacewalk-proxy-installer] release [1.9.2-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index 5b95d6c..6740e31 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 1.9.1
+Version: 1.9.2
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -96,6 +96,9 @@ spacewalk-pylint $RPM_BUILD_ROOT/usr/share/rhn
%doc LICENSE answers.txt
%changelog
+* Thu Feb 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.2-1
+- made proxy installer systemd ready
+
* Mon Jan 28 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.9.1-1
- 896125 - use standard option parser
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer
index ad9fd5b..990b7f7 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.9.1-1 proxy/installer/
+1.9.2-1 proxy/installer/
11 years, 3 months