rel-eng/packages reporting/spacewalk-reports.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-reports | 2 +-
reporting/spacewalk-reports.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 6f0bdfb3fde22feb62a7df08fc42bbaa4457aeab
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Sep 17 10:27:58 2013 +0200
Automatic commit of package [spacewalk-reports] release [2.1.10-1].
diff --git a/rel-eng/packages/spacewalk-reports b/rel-eng/packages/spacewalk-reports
index bf5f863..cf4e54c 100644
--- a/rel-eng/packages/spacewalk-reports
+++ b/rel-eng/packages/spacewalk-reports
@@ -1 +1 @@
-2.1.9-1 reporting/
+2.1.10-1 reporting/
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index 31b5d6a..ec46257 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -2,7 +2,7 @@ Name: spacewalk-reports
Summary: Script based reporting
Group: Applications/Internet
License: GPLv2
-Version: 2.1.9
+Version: 2.1.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
%doc COPYING
%changelog
+* Tue Sep 17 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.10-1
+- 1008309 - further imporove postgresql performance
+
* Mon Sep 16 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.9-1
- 1008309 - further imporove postgresql performance
10 years, 8 months
reporting/reports
by Tomáš Kašpárek
reporting/reports/data/packages-updates-newest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 3e3cf359e02af7703516ded9927132476b9a55d0
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Sep 17 10:24:17 2013 +0200
1008309 - further imporove postgresql performance
select from table rhnServerNeededCache instead of rhnServerNeededPackageCache view
diff --git a/reporting/reports/data/packages-updates-newest b/reporting/reports/data/packages-updates-newest
index 7b43aed..b6ed84a 100644
--- a/reporting/reports/data/packages-updates-newest
+++ b/reporting/reports/data/packages-updates-newest
@@ -34,7 +34,7 @@ sql:
NPE.version as newest_version,
NPE.release as newest_release
from rhnServer S
- join rhnServerNeededPackageCache SPC on S.id=SPC.server_id
+ join rhnServerNeededCache SPC on S.id=SPC.server_id
join rhnPackage P on SPC.package_id=P.id
join rhnPackageName PN on P.name_id=PN.id
join rhnServerPackage SP on SP.server_id=S.id and SP.name_id=P.name_id
10 years, 8 months
client/debian client/rhel client/solaris client/tools java/code java/spacewalk-java.spec monitoring/NOCpulsePlugins monitoring/PerlModules proxy/installer spacewalk/certs-tools spacewalk/setup
by mkollar
client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_check.py | 2 +-
client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py | 2 +-
client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateErrors.py | 2 +-
client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py | 2 +-
client/rhel/rhn-client-tools/rhn-client-tools.spec | 2 +-
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 2 +-
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 2 +-
client/rhel/rhnlib/test/09-test-errcodes.py | 2 +-
client/solaris/rhnclient/rhnclient.spec | 2 +-
client/solaris/smartpm/smart/util/pexpect.py | 2 +-
client/tools/rhn-virtualization/virtualization/start_domain.py | 2 +-
client/tools/rhncfg/config_common/rpc_wrapper.py | 2 +-
client/tools/rhnpush/rhnpush.py | 2 +-
client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8 | 2 +-
java/code/internal/src/com/redhat/rhn/internal/junit/RhnCustomFormatter.java | 2 +-
java/code/src/com/redhat/rhn/common/util/download/DownloadException.java | 2 +-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_de.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_es.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_it.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ja.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ko.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_pt_BR.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_CN.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_TW.xml | 4 ++--
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java | 2 +-
java/spacewalk-java.spec | 4 ++--
monitoring/NOCpulsePlugins/RHAPS/ExecuteQueue.pm | 2 +-
monitoring/NOCpulsePlugins/RHAPS/HeapFree.pm | 2 +-
monitoring/NOCpulsePlugins/RHAPS/JDBCConnectionPool.pm | 2 +-
monitoring/NOCpulsePlugins/RHAPS/Servlet.pm | 2 +-
monitoring/NOCpulsePlugins/RHAPS/State.pm | 2 +-
monitoring/PerlModules/NP/Probe/DataSource/SoapLite.pm | 2 +-
proxy/installer/rhn_proxy_activate.py | 4 ++--
spacewalk/certs-tools/rhn_bootstrap.py | 2 +-
spacewalk/setup/bin/spacewalk-setup | 2 +-
43 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit cb6843672a08e1c5124716e150a3f7aa12b77afa
Author: Matej Kollar <mkollar(a)redhat.com>
Date: Mon Sep 16 20:18:08 2013 +0200
Grammar error occurred
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_check.py b/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_check.py
index ef6609c..747c26d 100755
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_check.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/bin/rhn_check.py
@@ -351,7 +351,7 @@ class CheckCli(rhncli.RhnCli):
log.log_exception(*sys.exc_info())
# The action code failed in some way. let's let the server know.
status = 6,
- message = "Fatal error in Python code occured"
+ message = "Fatal error in Python code occurred"
data = {}
return (status, message, data)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py
index 7c201f1..aa8239d 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/rpcServer.py
@@ -53,7 +53,7 @@ class RetryServer(rpclib.Server):
self.serverList.resetServerIndex()
raise
- msg = "An error occured talking to %s:\n" % self._host
+ msg = "An error occurred talking to %s:\n" % self._host
msg = msg + "%s\n%s\n" % (sys.exc_type, sys.exc_value)
msg = msg + "Trying the next serverURL: %s\n" % self.serverList.server()
self.log.log_me(msg)
diff --git a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 39174a4..eec8099 100644
--- a/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/debian/packages-already-in-debian/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -201,7 +201,7 @@ class NoChannelsError(NoLogError):
pass
class NetworkError(Error):
- """ some generic network error occured, e.g. connection reset by peer """
+ """ some generic network error occurred, e.g. connection reset by peer """
premsg = _("Network error: ")
class SSLCertificateVerifyFailedError(RepoError, Error):
diff --git a/client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py b/client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py
index fd3f3e2..e1f1c40 100755
--- a/client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py
+++ b/client/debian/packages-already-in-debian/rhnlib/test/09-test-errcodes.py
@@ -42,5 +42,5 @@ except ProtocolError, e:
print reportError(e.headers)
print("OK (error above expected)");
sys.exit(0);
-print("ERROR: Exception didn't occured!");
+print("ERROR: Exception didn't occurred!");
sys.exit(-1);
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index e4380b4..c1f273d 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -527,7 +527,7 @@ make -f Makefile.rhn-client-tools test
- Fix missing exception scope
* Mon Jul 09 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.11-1
-- Fix typo in 'Fatal error in Python code occured'
+- Fix typo in 'Fatal error in Python code occurred'
* Wed Jul 04 2012 Miroslav Suchý <msuchy(a)redhat.com> 1.8.10-1
- read memory information even on kernels 3.x
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
index e9e2e29..bd07b4b 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
@@ -54,7 +54,7 @@ class RetryServer(rpclib.Server):
self.serverList.resetServerIndex()
raise
- msg = "An error occured talking to %s:\n" % self._host
+ msg = "An error occurred talking to %s:\n" % self._host
msg = msg + "%s\n%s\n" % (sys.exc_type, sys.exc_value)
msg = msg + "Trying the next serverURL: %s\n" % self.serverList.server()
self.log.log_me(msg)
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 498add0..f69405a 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -220,7 +220,7 @@ class NoChannelsError(NoLogError):
pass
class NetworkError(Error):
- """ some generic network error occured, e.g. connection reset by peer """
+ """ some generic network error occurred, e.g. connection reset by peer """
premsg = _("Network error: ")
class SSLCertificateVerifyFailedError(RepoError, Error):
diff --git a/client/rhel/rhnlib/test/09-test-errcodes.py b/client/rhel/rhnlib/test/09-test-errcodes.py
index fd3f3e2..e1f1c40 100755
--- a/client/rhel/rhnlib/test/09-test-errcodes.py
+++ b/client/rhel/rhnlib/test/09-test-errcodes.py
@@ -42,5 +42,5 @@ except ProtocolError, e:
print reportError(e.headers)
print("OK (error above expected)");
sys.exit(0);
-print("ERROR: Exception didn't occured!");
+print("ERROR: Exception didn't occurred!");
sys.exit(-1);
diff --git a/client/solaris/rhnclient/rhnclient.spec b/client/solaris/rhnclient/rhnclient.spec
index 099ab0e..036b70d 100644
--- a/client/solaris/rhnclient/rhnclient.spec
+++ b/client/solaris/rhnclient/rhnclient.spec
@@ -91,7 +91,7 @@ rm -rf $RPM_BUILD_ROOT
- Add missing space to log message
* Mon Jul 09 2012 Michael Mraka <michael.mraka(a)redhat.com> 0.16-1
-- Fix typo in 'Fatal error in Python code occured'
+- Fix typo in 'Fatal error in Python code occurred'
* Thu Jun 21 2012 Jan Pazdziora 0.15-1
- allow linking against openssl
diff --git a/client/solaris/smartpm/smart/util/pexpect.py b/client/solaris/smartpm/smart/util/pexpect.py
index a5d1045..bafb109 100644
--- a/client/solaris/smartpm/smart/util/pexpect.py
+++ b/client/solaris/smartpm/smart/util/pexpect.py
@@ -590,7 +590,7 @@ class spawn:
You can see all the data read before the match in 'before'.
You can see the data that was matched in 'after'.
The re.MatchObject used in the re match will be in 'match'.
- If an error occured then 'before' will be set to all the
+ If an error occurred then 'before' will be set to all the
data read so far and 'after' and 'match' will be None.
If timeout is -1 then timeout will be set to the self.timeout value.
diff --git a/client/tools/rhn-virtualization/virtualization/start_domain.py b/client/tools/rhn-virtualization/virtualization/start_domain.py
index 9f8405c..cd8eddd 100644
--- a/client/tools/rhn-virtualization/virtualization/start_domain.py
+++ b/client/tools/rhn-virtualization/virtualization/start_domain.py
@@ -82,7 +82,7 @@ def _prepare_guest_kernel_and_ramdisk(config):
commands.getstatusoutput("%s -q %s" % (PYGRUB, disk_image))
if status != 0:
raise VirtualizationException, \
- "Error occured while executing '%s' (status=%d). Output=%s" % \
+ "Error occurred while executing '%s' (status=%d). Output=%s" % \
(PYGRUB, status, output)
# Now analyze the output and extract the names of the new kernel and initrd
diff --git a/client/tools/rhncfg/config_common/rpc_wrapper.py b/client/tools/rhncfg/config_common/rpc_wrapper.py
index 3bb99d9..1d8e506 100644
--- a/client/tools/rhncfg/config_common/rpc_wrapper.py
+++ b/client/tools/rhncfg/config_common/rpc_wrapper.py
@@ -133,7 +133,7 @@ class Server(rpclib.Server):
#This is the logic for switching to a new server resides.
def _failover(self):
#The print statements are from alikins rpcServer.py.
- msg = "An error occured talking to %s:\n" % self._get_uri()
+ msg = "An error occurred talking to %s:\n" % self._get_uri()
msg = msg + "%s\n%s\n" % (sys.exc_type, sys.exc_value)
#Increments the index to point to the next server in self.list_of_uris
diff --git a/client/tools/rhnpush/rhnpush.py b/client/tools/rhnpush/rhnpush.py
index 5f5fcbd..1e7d93e 100755
--- a/client/tools/rhnpush/rhnpush.py
+++ b/client/tools/rhnpush/rhnpush.py
@@ -409,7 +409,7 @@ class UploadClass(uploadLib.UploadClass):
break
#if the preceeding for-loop exits without a call to break, then this else clause gets called.
- #What's kind of weird is that if the preceeding for-loop doesn't call break then an error occured
+ #What's kind of weird is that if the preceeding for-loop doesn't call break then an error occurred
#and all of retry attempts failed. If the for-loop *does* call break then everything is hunky-dory.
#In short, this else clause only get's called if something is F.U.B.A.R and the retry attempts don't
#fix anything.
diff --git a/client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8 b/client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8
index ebc33a6..d9d8f1e 100644
--- a/client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8
+++ b/client/tools/spacewalk-abrt/man/en/spacewalk-abrt.8
@@ -27,7 +27,7 @@ spacewalk-abrt [\fIoptions\fP] command
.PP
\fBspacewalk-abrt\fP is a client program that reports a software crash
-that occured on a client system to Spacewalk or Red Hat Satellite.
+that occurred on a client system to Spacewalk or Red Hat Satellite.
The program operates on top of a problem directory created by \fBABRT\fP
daemon. Ordinarilly, this program is executed automatically by \fBabrtd\fP
when a software crash occurs.
diff --git a/java/code/internal/src/com/redhat/rhn/internal/junit/RhnCustomFormatter.java b/java/code/internal/src/com/redhat/rhn/internal/junit/RhnCustomFormatter.java
index d4d025e..0a1f338 100644
--- a/java/code/internal/src/com/redhat/rhn/internal/junit/RhnCustomFormatter.java
+++ b/java/code/internal/src/com/redhat/rhn/internal/junit/RhnCustomFormatter.java
@@ -219,7 +219,7 @@ public class RhnCustomFormatter implements JUnitResultFormatter {
/**
* Interface TestListener.
*
- * <p>An error occured while running the test.
+ * <p>An error occurred while running the test.
* @param test the Test that failed
* @param t the Throwable that occurred
*/
diff --git a/java/code/src/com/redhat/rhn/common/util/download/DownloadException.java b/java/code/src/com/redhat/rhn/common/util/download/DownloadException.java
index fec164b..ec9cc18 100644
--- a/java/code/src/com/redhat/rhn/common/util/download/DownloadException.java
+++ b/java/code/src/com/redhat/rhn/common/util/download/DownloadException.java
@@ -30,7 +30,7 @@ public class DownloadException extends RhnRuntimeException {
private String content;
private String url;
private int errorCode;
- private static final String ERROR_TEMPLATE = "Error occured while downloading " +
+ private static final String ERROR_TEMPLATE = "Error occurred while downloading " +
"contents from [%s].\nHere are the contents of" +
" the error\n [%s] \n \n error code = [%s]";
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
index 34b9a0c..df6e355 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml
@@ -556,7 +556,7 @@
<target>পেজ অনুরোধ সংক্রান্ত ত্রুটি</target>
</trans-unit>
<trans-unit id="badparam.jsp.summary">
- <source>We could not display the requested page because of a missing parameter. This error could have occured several ways:</source>
+ <source>We could not display the requested page because of a missing parameter. This error could have occurred several ways:</source>
<context-group name="ctx">
<context context-type="sourcefile">Bad Parameter error page</context>
</context-group>
@@ -8724,7 +8724,7 @@ Please note that some manual configuration of these scripts may still be require
<target>@@PRODUCT_NAME@@ Cobbler-র বৈশিষ্ট্য নীচে নির্ধারণ করুন।</target>
</trans-unit>
<trans-unit id="cobbler.jsp.summary2">
- <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occured.</source>
+ <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occurred.</source>
<target>কোনো কারণবস্ত ব্যবহারকারী দ্বারা cobbler পরিবর্তিত হলে Cobbler sync সহযোগে /tftpboot অথবা /var/www/cobbler-র তথ্য সংশোধন অথবা পুনরায় গঠন করা হয়।</target>
</trans-unit>
<trans-unit id="cobbler.jsp.summary3">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
index 7ea9dc5..017fde5 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml
@@ -556,7 +556,7 @@
<target>પાનાં અરજીમાં ભૂલ</target>
</trans-unit>
<trans-unit id="badparam.jsp.summary">
- <source>We could not display the requested page because of a missing parameter. This error could have occured several ways:</source>
+ <source>We could not display the requested page because of a missing parameter. This error could have occurred several ways:</source>
<context-group name="ctx">
<context context-type="sourcefile">Bad Parameter error page</context>
</context-group>
@@ -8725,7 +8725,7 @@ Please note that some manual configuration of these scripts may still be require
<target>નીચે તમારા @@PRODUCT_NAME@@ Cobbler સુયોજનોને સુયોજિત કરો.</target>
</trans-unit>
<trans-unit id="cobbler.jsp.summary2">
- <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occured.</source>
+ <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occurred.</source>
<target>Cobbler સુમેળ એ સમાવિષ્ટો /tftpboot or /var/www/cobbler ને પુન:બિલ્ડ કરવા અથવા સુધારવા વપરાયેલ છે જ્યારે cobbler નો જાતે બદલાવ ઉત્પન્ન થયેલ હોય.</target>
</trans-unit>
<trans-unit id="cobbler.jsp.summary3">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
index a90ea16..292e29c 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml
@@ -556,7 +556,7 @@
<target>पृष्ठ आग्रह त्रुटि</target>
</trans-unit>
<trans-unit id="badparam.jsp.summary">
- <source>We could not display the requested page because of a missing parameter. This error could have occured several ways:</source>
+ <source>We could not display the requested page because of a missing parameter. This error could have occurred several ways:</source>
<context-group name="ctx">
<context context-type="sourcefile">Bad Parameter error page</context>
</context-group>
@@ -8725,7 +8725,7 @@ Please note that some manual configuration of these scripts may still be require
<target>अपने @@PRODUCT_NAME@@ कोब्बलर सेटिंग को नीचे सेटअप करें.</target>
</trans-unit>
<trans-unit id="cobbler.jsp.summary2">
- <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occured.</source>
+ <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occurred.</source>
<target>कोब्बलर सिंक को /tftpboot या /var/www/ कोब्बलर सामग्री को सुधारने या पुनर्निर्माण करने में प्रयोग किया जाता है जब कोब्बलर का दस्ती रूपांतरण होता है.</target>
</trans-unit>
<trans-unit id="cobbler.jsp.summary3">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
index 8c35c4f..32c084b 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml
@@ -556,7 +556,7 @@
<target>ਸਫ਼ਾ ਮੰਗ ਗਲਤੀ</target>
</trans-unit>
<trans-unit id="badparam.jsp.summary">
- <source>We could not display the requested page because of a missing parameter. This error could have occured several ways:</source>
+ <source>We could not display the requested page because of a missing parameter. This error could have occurred several ways:</source>
<context-group name="ctx">
<context context-type="sourcefile">Bad Parameter error page</context>
</context-group>
@@ -8724,7 +8724,7 @@ Please note that some manual configuration of these scripts may still be require
<target>ਹੇਠਾਂ ਆਪਣੀ @@PRODUCT_NAME@@ Cobbler ਸੈਟਿੰਗ ਕਰੋ।</target>
</trans-unit>
<trans-unit id="cobbler.jsp.summary2">
- <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occured.</source>
+ <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occurred.</source>
<target>Cobbler sync ਨੂੰ /tftpboot ਜਾਂ /var/www/cobbler ਸੰਖੇਪ ਰੀਪੇਅਰ ਜਾਂ ਰੀਬਿਲਡ ਕਰਨ ਲਈ ਵਰਤਿਆ ਜਾਂਦਾ ਹੈ ਜਦੋਂ cobbler ਦੀ ਦਸਤਾਵੇਜ਼ ਸੋਧ ਹੁੰਦੀ ਹੈ।</target>
</trans-unit>
<trans-unit id="cobbler.jsp.summary3">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
index 081be5e..20426ee 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml
@@ -556,7 +556,7 @@
<target>பக்க கோரிக்கை பிழை</target>
</trans-unit>
<trans-unit id="badparam.jsp.summary">
- <source>We could not display the requested page because of a missing parameter. This error could have occured several ways:</source>
+ <source>We could not display the requested page because of a missing parameter. This error could have occurred several ways:</source>
<context-group name="ctx">
<context context-type="sourcefile">Bad Parameter error page</context>
</context-group>
@@ -8725,7 +8725,7 @@ Please note that some manual configuration of these scripts may still be require
<target>உங்கள் @@PRODUCT_NAME@@ Cobbler அமைவுகளை கீழே அமைக்கவும்.</target>
</trans-unit>
<trans-unit id="cobbler.jsp.summary2">
- <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occured.</source>
+ <source>Cobbler sync is used to repair or rebuild the contents /tftpboot or /var/www/cobbler when manual modification of cobbler has occurred.</source>
<target>காப்பளர் ஒருங்கிணைப்பு /tftpboot or /var/www/ காப்பளரை சரிசெய்து அல்லது மறுஅமைக்க பயன்படுகிறது கைமுறை மாற்றங்கள் எப்போது காப்பளரில் ஏற்படுகிறதோ.</target>
</trans-unit>
<trans-unit id="cobbler.jsp.summary3">
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_de.xml
index 74d6bd5..fd5bd69 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_de.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_de.xml
@@ -178,14 +178,14 @@
<target>Software Abstürze Überblick</target>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
<target>Die nachstehende Tabelle zeigt Softwareabstürze, nach UUID gruppiert, die auf Ihrem System aufgetreten sind. Identische Absturz UUIDs können möglicherweise Hinweise auf ähnliche oder identische Arten von Softwareabstürzen anzeigen.</target>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
index fe4456d..7295668 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_en_US.xml
@@ -154,13 +154,13 @@
</context-group>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_es.xml
index 1de9c69..fffcdcb 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_es.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_es.xml
@@ -178,14 +178,14 @@
<target>Resumen de fallos de software</target>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
<target>La tabla a continuación lista los fallos de software, agrupados por UUID que se presentan en sus sistemas. Los UUID de fallos idénticos pueden en potencia indicar tipos de fallos de software parecidos o idénticos.</target>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml
index d2d88b8..28bef78 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_fr.xml
@@ -178,14 +178,14 @@
<target>Aperçu des incidents logiciel</target>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
<target>Le tableau ci-dessous répertorie les incidents logiciel, regroupés par UUID, qui se sont produits sur vos systèmes. Des UUID d'incidents identiques indiquent potentiellement des incidents logiciel de type similaire ou identique.</target>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_it.xml
index 79c492c..a967c48 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_it.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_it.xml
@@ -178,14 +178,14 @@
<target>Visualizzazione crash del software</target>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
<target>La tabella di seguito riportata elenca i crash del software, raggruppati per UUID, che si sono verificati sui sistemi. UUID di crash identici potrebbero potenzialmente indicare tipi di crash del software identici o simili.</target>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ja.xml
index 35b0ba7..cf6e858 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ja.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ja.xml
@@ -178,14 +178,14 @@
<target>ソフトウェアクラッシュの概要</target>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
<target>以下の表は、お使いのシステムで生じたソフトウェアのクラッシュを UUID ごとに分類した一覧です。同一のクラッシュ UUID は、ソフトウェアクラッシュの同様または同一のタイプを示している可能性があります。</target>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ko.xml
index 85dfd09..bfb0fb1 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ko.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ko.xml
@@ -178,14 +178,14 @@
<target>소프트웨어 충돌 개요</target>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
<target>다음 표는 시스템에서 발생하는 소프트웨어 충돌을 UUID 별로 분류한 목록입니다. 동일한 충돌 UUID는 소프트웨어 충돌과 유사하거나 동일한 유형을 나타낼 수 있습니다.</target>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_pt_BR.xml
index 23e90c3..1149570 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_pt_BR.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_pt_BR.xml
@@ -178,14 +178,14 @@
<target>Visão Geral de Travamento do Software</target>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
<target>A tabela abaixo lista travamentos de software, agrupados por UUID, que ocorreram em seu sistema. UUIDs de travamentos idênticos podem indicar potencialmente tipos similares ou idênticos de travamentos de software.</target>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml
index 8e84909..0733eaf 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_ru.xml
@@ -178,14 +178,14 @@
<target>Обзор программных сбоев</target>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
<target>Ниже перечислены сбои, сгруппированные по UUID. </target>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_CN.xml
index 5c4456a..4d29efa 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_CN.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_CN.xml
@@ -178,14 +178,14 @@
<target>软件崩溃概述</target>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
<target>下表列出了您系统中出现的软件崩溃,根据 UUID 分组。完全相同的崩溃 UUID 可能代表类似或者完全相同的软件崩溃类型。</target>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_TW.xml
index 7445f92..0dee2cc 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_TW.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/nav/StringResource_zh_TW.xml
@@ -178,14 +178,14 @@
<target>軟體當機總覽</target>
</trans-unit>
<trans-unit id="software.crashes.overview.summary">
- <source>The table below lists software crashes, grouped by UUID, that occured on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
+ <source>The table below lists software crashes, grouped by UUID, that occurred on your systems. Identical crash UUIDs may potentially indicate similar or identical types of software crash.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
<target>下列表格列出了在您系統上發生的軟體當機事件(以 UUID 排序)。相似的 UUID 可能代表類似或相同類型的軟體當機事件。</target>
</trans-unit>
<trans-unit id="software.crashes.by.uuid.summary">
- <source>The table below lists systems where a crash with the above UUID occured.</source>
+ <source>The table below lists systems where a crash with the above UUID occurred.</source>
<context-group name="ctx">
<context context-type="sourcefile">Systems Navigation Menu</context>
</context-group>
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
index ba2d361..3021e33 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java
@@ -454,7 +454,7 @@ public class CrashHandler extends BaseHandler {
* #prop_desc("int", "server_id",
* "ID of the server the crash occurred on")
* #prop_desc("string", "server_name",
- * "Name of the server the crash occured on")
+ * "Name of the server the crash occurred on")
* #prop_desc("int", "crash_id", "ID of the crash with given UUID")
* #prop_desc("int", "crash_count",
* "Number of times the crash with given UUID occurred")
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 88e3266..94572f3 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -6516,7 +6516,7 @@ Feature: Support channel-permissions on ISS
- Made the expansion decorator show the show all|hide all correctly
(paji(a)redhat.com)
- queuing channel repo generation for new channels (jsherril(a)redhat.com)
-- Fixed a pagination issue that occured on first page load (paji(a)redhat.com)
+- Fixed a pagination issue that occurred on first page load (paji(a)redhat.com)
- ignoring virt bonded interfaces, changing dups page to not sure the same set,
and fixing inactive counts on mac and hostname pages (jsherril(a)redhat.com)
- 585901 - add an extra null condition (tlestach(a)redhat.com)
@@ -6537,7 +6537,7 @@ Feature: Support channel-permissions on ISS
- More work on select all magic (paji(a)redhat.com)
- 588901 - Fix listLatestUpgradablePackages API results
(joshua.roys(a)gtri.gatech.edu)
-- Fixed an accidental compile error that occured due to a previous commit
+- Fixed an accidental compile error that occurred due to a previous commit
(paji(a)redhat.com)
- Added some magic to show the system names and url instead of ids in the dups
page (paji(a)redhat.com)
diff --git a/monitoring/NOCpulsePlugins/RHAPS/ExecuteQueue.pm b/monitoring/NOCpulsePlugins/RHAPS/ExecuteQueue.pm
index 79bf7d3..5d0d2ee 100644
--- a/monitoring/NOCpulsePlugins/RHAPS/ExecuteQueue.pm
+++ b/monitoring/NOCpulsePlugins/RHAPS/ExecuteQueue.pm
@@ -38,7 +38,7 @@ sub run {
#Execute each command with its parameters and check for errors.
- # If an error has occured, set the status to unknown and return.
+ # If an error has occurred, set the status to unknown and return.
$service->execute($command, @count_params);
if(defined($service->errors)) {
diff --git a/monitoring/NOCpulsePlugins/RHAPS/HeapFree.pm b/monitoring/NOCpulsePlugins/RHAPS/HeapFree.pm
index c4c5faf..702e807 100644
--- a/monitoring/NOCpulsePlugins/RHAPS/HeapFree.pm
+++ b/monitoring/NOCpulsePlugins/RHAPS/HeapFree.pm
@@ -31,7 +31,7 @@ sub run {
"currentUsedMemory");
# Execute each command with its parameters and check for errors.
- # If an error has occured, set the status to unknown and return.
+ # If an error has occurred, set the status to unknown and return.
$service->execute($command, @total_params);
if(defined($service->errors)) {
$result->item_unknown("Could not connect to the endpoint. Error: ". $service->errors);
diff --git a/monitoring/NOCpulsePlugins/RHAPS/JDBCConnectionPool.pm b/monitoring/NOCpulsePlugins/RHAPS/JDBCConnectionPool.pm
index c4a899c..9f424f3 100644
--- a/monitoring/NOCpulsePlugins/RHAPS/JDBCConnectionPool.pm
+++ b/monitoring/NOCpulsePlugins/RHAPS/JDBCConnectionPool.pm
@@ -54,7 +54,7 @@ sub run {
# Execute each command with its parameters and check for errors.
- # If an error has occured, set the status to unknown and return.
+ # If an error has occurred, set the status to unknown and return.
$service->execute($command, @currentOpened_params);
if(defined($service->errors)) {
$result->item_unknown("Could not connect to the endpoint. Error: ". $service->errors);
diff --git a/monitoring/NOCpulsePlugins/RHAPS/Servlet.pm b/monitoring/NOCpulsePlugins/RHAPS/Servlet.pm
index 1b69f52..dcc7f4c 100644
--- a/monitoring/NOCpulsePlugins/RHAPS/Servlet.pm
+++ b/monitoring/NOCpulsePlugins/RHAPS/Servlet.pm
@@ -47,7 +47,7 @@ sub run {
"jspReloadCount");
# Execute each command with its parameters and check for errors.
- # If an error has occured, set the status to unknown and return.
+ # If an error has occurred, set the status to unknown and return.
$service->execute($command, @maxTime_params);
if(defined($service->errors)) {
$result->item_unknown("Could not connect to the endpoint. Error: ". $service->errors);
diff --git a/monitoring/NOCpulsePlugins/RHAPS/State.pm b/monitoring/NOCpulsePlugins/RHAPS/State.pm
index b1a4abb..6f0a189 100644
--- a/monitoring/NOCpulsePlugins/RHAPS/State.pm
+++ b/monitoring/NOCpulsePlugins/RHAPS/State.pm
@@ -28,7 +28,7 @@ sub run {
"serverName");
# Execute the command with its parameters and check for errors.
- # If an error has occured, set the status to unknown and return.
+ # If an error has occurred, set the status to unknown and return.
$service->execute($command, @state);
if(defined($service->errors)) {
$result->item_unknown("Could not connect to the endpoint. Error: ". $service->errors);
diff --git a/monitoring/PerlModules/NP/Probe/DataSource/SoapLite.pm b/monitoring/PerlModules/NP/Probe/DataSource/SoapLite.pm
index f352b07..6020edc 100644
--- a/monitoring/PerlModules/NP/Probe/DataSource/SoapLite.pm
+++ b/monitoring/PerlModules/NP/Probe/DataSource/SoapLite.pm
@@ -95,7 +95,7 @@ sub execute {
$Log->log(2, "About to execute command " . $command . " with params: " . join(" - ", @command_params) . "\n");
my $tmp = $service->$command(@command_params);
$self->result($tmp);
- # check to see if a fault occured in SOAPLite
+ # check to see if a fault occurred in SOAPLite
if(defined($faultstring)) {
$self->errors($faultstring);
}
diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_proxy_activate.py
index 015d11d..ca14be2 100644
--- a/proxy/installer/rhn_proxy_activate.py
+++ b/proxy/installer/rhn_proxy_activate.py
@@ -377,7 +377,7 @@ def activateProxy(options):
if errorCode != 0:
if not errorString:
- errorString = ("An unknown error occured. Consult with your Red Hat representative.\n")
+ errorString = ("An unknown error occurred. Consult with your Red Hat representative.\n")
sys.stderr.write("\nThere was a problem activating the Spacewalk Proxy entitlement:\n%s\n" % errorString)
sys.exit(abs(errorCode))
@@ -532,7 +532,7 @@ def main():
errorCode, errorString = createMonitoringScout(options)
if errorCode != 0:
if not errorString:
- errorString = ("An unknown error occured. Consult with your Red Hat representative.\n")
+ errorString = ("An unknown error occurred. Consult with your Red Hat representative.\n")
sys.stderr.write("\nThere was a problem activating Monitoring Scout:\n%s\n" % errorString)
sys.exit(abs(errorCode))
else:
diff --git a/spacewalk/certs-tools/rhn_bootstrap.py b/spacewalk/certs-tools/rhn_bootstrap.py
index 14b838d..28e1d44 100644
--- a/spacewalk/certs-tools/rhn_bootstrap.py
+++ b/spacewalk/certs-tools/rhn_bootstrap.py
@@ -656,6 +656,6 @@ if __name__ == "__main__":
except ValueError, e:
raise # should exit with a 1 (errnoGeneral)
except Exception:
- sys.stderr.write('Unhandled ERROR occured.\n')
+ sys.stderr.write('Unhandled ERROR occurred.\n')
raise # should exit with a 1 (errnoGeneral)
diff --git a/spacewalk/setup/bin/spacewalk-setup b/spacewalk/setup/bin/spacewalk-setup
index 6dcc4c7..5194806 100755
--- a/spacewalk/setup/bin/spacewalk-setup
+++ b/spacewalk/setup/bin/spacewalk-setup
@@ -244,7 +244,7 @@ sub remove_old_jvm {
my $result = `rpm -e $remove 2>&1`;
if ($? >> 8) {
- print Spacewalk::Setup::loc("** Error occured while removing the packages:\n");
+ print Spacewalk::Setup::loc("** Error occurred while removing the packages:\n");
print Spacewalk::Setup::loc($result);
}
}
10 years, 8 months
java/code
by StephenHerr
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 9 ++
java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp | 36 ----------
java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp | 36 ----------
java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf | 31 ++++++++
4 files changed, 42 insertions(+), 70 deletions(-)
New commits:
commit c9b9459dd78cf381bd8da0bdbed90a6e5db296ff
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Sep 16 16:34:06 2013 -0400
1008687 - Fixing unlocalized strings in Manage Software Channels tab
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 390fa9a..51f22ca 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
@@ -19104,6 +19104,15 @@ given channel.</source>
This process can take several seconds. Be patient and do not click the button below more than once.</source>
</trans-unit>
+ <trans-unit id="channel.jsp.manage.package.channel">
+ <source>Channel</source>
+ </trans-unit>
+ <trans-unit id="channel.jsp.manage.package.allpackages">
+ <source>All managed packages.</source>
+ </trans-unit>
+ <trans-unit id="channel.jsp.manage.package.packagesnochannels">
+ <source>Packages in no channels.</source>
+ </trans-unit>
<trans-unit id="baddownload.jsp.title">
<source>File Download Failed</source>
</trans-unit>
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp
index e4f5a7f..188174b 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/addpackages.jsp
@@ -28,41 +28,7 @@
<bean:message key="channel.jsp.package.addmessage"/>
<h2><img src="/img/rhn-icon-packages.gif"> <bean:message key="channel.jsp.package.addtitle"/></h2>
-
-<table class="details" width="80%">
-
- <tr> <th width="10%">Channel:</th><td width="40%">
- <select name="selected_channel">
- <option value="all_managed_packages" <c:if test="${all_selected eq true}">selected = "selected"</c:if>>All managed packages</option>
- <option value="orphan_packages" <c:if test="${orphan_selected eq true}">selected = "selected"</c:if>>Packages in no channels.</option>
- <optgroup>
- <c:forEach var="option" items="${channel_list}">
- <c:choose>
- <c:when test="${option.baseChannel}">
- </optgroup>
- <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name} </option>
- <optgroup>
- </c:when>
- <c:otherwise>
- <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name}</option>
- </c:otherwise>
- </c:choose>
- </c:forEach>
- </optgroup>
- </select>
-
- </td>
- <td>
- <input type="submit" name="view" value="<bean:message key="channel.jsp.package.viewpackages"/>">
- </td>
- </tr>
-
-
-
- </table>
-
-
-
+<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf" %>
<rl:list dataset="pageList" name="packageList"
decorator="SelectableDecorator"
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
index dfbf9d9..495c4c3 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/package/listremovecustompackages.jsp
@@ -32,41 +32,7 @@
<bean:message key="channel.jsp.manage.package.message"/>
<h2><bean:message key="channel.jsp.manage.package.subtitle"/></h2>
-
-<table class="details" width="80%">
-
- <tr> <th width="10%">Channel:</th><td width="40%">
- <select name="selected_channel">
- <option value="all_managed_packages" <c:if test="${all_selected eq true}">selected = "selected"</c:if>>All managed packages</option>
- <option value="orphan_packages" <c:if test="${orphan_selected eq true}">selected = "selected"</c:if>>Packages in no channels.</option>
- <optgroup>
- <c:forEach var="option" items="${channel_list}">
- <c:choose>
- <c:when test="${option.baseChannel}">
- </optgroup>
- <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name} </option>
- <optgroup>
- </c:when>
- <c:otherwise>
- <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name}</option>
- </c:otherwise>
- </c:choose>
- </c:forEach>
- </optgroup>
- </select>
-
- </td>
- <td>
- <input type="submit" name="view" value="<bean:message key="channel.jsp.package.viewpackages"/>">
- </td>
- </tr>
-
-
-
- </table>
-
-
-
+<%@ include file="/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf" %>
<rl:list dataset="pageList" name="packageList"
decorator="SelectableDecorator"
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
new file mode 100644
index 0000000..d1fc3e0
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/channel/manage/channel_selector.jspf
@@ -0,0 +1,31 @@
+<table class="details" width="80%">
+
+ <tr> <th width="10%"><bean:message key="channel.jsp.manage.package.channel"/>:</th>
+ <td width="40%">
+ <select name="selected_channel">
+ <option value="all_managed_packages" <c:if test="${all_selected eq true}">selected = "selected"</c:if>><bean:message key="channel.jsp.manage.package.allpackages"/></option>
+ <option value="orphan_packages" <c:if test="${orphan_selected eq true}">selected = "selected"</c:if>><bean:message key="channel.jsp.manage.package.packagesnochannels"/></option>
+ <optgroup>
+ <c:forEach var="option" items="${channel_list}">
+ <c:choose>
+ <c:when test="${option.baseChannel}">
+ </optgroup>
+ <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name} </option>
+ <optgroup>
+ </c:when>
+ <c:otherwise>
+ <option value="${option.id}" <c:if test="${option.selected eq true}">selected = "selected"</c:if> >${option.name}</option>
+ </c:otherwise>
+ </c:choose>
+ </c:forEach>
+ </optgroup>
+ </select>
+ </td>
+ <td>
+ <input type="submit" name="view" value="<bean:message key="channel.jsp.package.viewpackages"/>">
+ </td>
+ </tr>
+
+
+
+</table>
\ No newline at end of file
10 years, 8 months
java/code
by StephenHerr
java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 584fa6c12f117a6bb333338d0fb89f461fc2395b
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Sep 16 14:58:27 2013 -0400
1006630 - Making "Update" button translated
diff --git a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
index 0cfee1e..f268868 100644
--- a/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
+++ b/java/code/webapp/WEB-INF/pages/user/edit/your_edit_address.jsp
@@ -31,7 +31,7 @@
<div align="right">
<hr />
- <html:submit value="Update" />
+ <input type="submit" value="<bean:message key="button.update" />" />
</div>
<html:hidden property="uid" value="${param.uid}"/>
10 years, 8 months
java/code
by StephenHerr
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3 +++
java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp | 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 80f311b7f043621c156ca9ee4076108897c19861
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Sep 16 14:34:41 2013 -0400
1008649 - Fixing unlocalized words
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index a524392..de21eb1 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -205,6 +205,9 @@
<trans-unit id="Custom">
<source>Custom</source>
</trans-unit>
+ <trans-unit id="Examples">
+ <source>Examples</source>
+ </trans-unit>
<trans-unit id="none specified">
<source>none specified</source>
</trans-unit>
diff --git a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
index 3a6615b..803ee90 100644
--- a/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/erratasearch.jsp
@@ -52,7 +52,7 @@
</html:submit>
<br />
<span class="small-text">
- <strong>Examples: </strong> <bean:message key="erratasearch.jsp.search.tip" />
+ <strong><bean:message key="Examples" />: </strong> <bean:message key="erratasearch.jsp.search.tip" />
</span>
</td>
</tr>
@@ -65,7 +65,7 @@
</html:select>
<br />
<span class="small-text">
- <strong>Tip:</strong> <bean:message key="erratasearch.jsp.whatsearch.tip" />
+ <strong><bean:message key="Tip" />:</strong> <bean:message key="erratasearch.jsp.whatsearch.tip" />
</span>
</td>
</tr>
10 years, 8 months
java/code
by StephenHerr
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 10 +++++++--
java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp | 11 ++++------
2 files changed, 13 insertions(+), 8 deletions(-)
New commits:
commit 3db28e34f43e98188201b711a0bbb67ebd812108
Author: Stephen Herr <sherr(a)redhat.com>
Date: Mon Sep 16 13:41:15 2013 -0400
1008631 - fixing untranslatable strings
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 e2319a8..390fa9a 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
@@ -4628,8 +4628,14 @@ value for this entitlement, excluding the default organization's consumption.</s
<trans-unit id="ssm.misc.index.syspref.update">
<source>Automatic application of relevant errata</source>
</trans-unit>
- <trans-unit id="ssm.misc.index.syspref.no">
- <source>No</source>
+ <trans-unit id="ssm.misc.index.syspref.changepreferences">
+ <source>Change Preferences</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.index.syspref.nochange">
+ <source>No Change</source>
+ </trans-unit>
+ <trans-unit id="ssm.misc.index.syspref.preference">
+ <source>Preference</source>
</trans-unit>
<trans-unit id="ssm.misc.reboot.header">
diff --git a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
index 746b877..c697ee4 100644
--- a/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
+++ b/java/code/webapp/WEB-INF/pages/ssm/systems/misc/index.jsp
@@ -38,11 +38,10 @@
<table width="96%" cellspacing="0" cellpadding="0" class="list" align="center">
<thead>
<tr>
- <th align="left">Preference</th>
- <th width="5%">Yes</th>
- <th width="5%">No</th>
-
- <th width="5%">No Change</th>
+ <th align="left"><bean:message key="ssm.misc.index.syspref.preference"/></th>
+ <th width="5%"><bean:message key="yes"/></th>
+ <th width="5%"><bean:message key="no"/></th>
+ <th width="5%"><bean:message key="ssm.misc.index.syspref.nochange"/></th>
</tr>
</thead>
@@ -73,7 +72,7 @@
<div align="right">
<hr />
- <input type="submit" name="sscd_change_system_prefs" value="Change Preferences" />
+ <input type="submit" name="sscd_change_system_prefs" value="<bean:message key="ssm.misc.index.syspref.changepreferences"/>" />
<input type="hidden" name="do_nothing_redir" value="landing.pxt" />
<input type="hidden" name="pxt:trap" value="rhn:ssm_change_system_prefs_cb" />
</div>
10 years, 8 months
Changes to 'refs/tags/spacewalk-java-2.1.42-1'
by Tomas Lestach
Tag 'spacewalk-java-2.1.42-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-09-16 09:12 +0000
Tagging package [spacewalk-java] version [2.1.42-1] in directory [java/].
Changes since spacewalk-reports-2.1.9-1:
Tomas Lestach (1):
Automatic commit of package [spacewalk-java] release [2.1.42-1].
---
java/spacewalk-java.spec | 29 ++++++++++++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
---
10 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 29 ++++++++++++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 29 insertions(+), 2 deletions(-)
New commits:
commit 20aa41086dcd8df228ac32ff5da332be23ff2099
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Sep 16 11:12:58 2013 +0200
Automatic commit of package [spacewalk-java] release [2.1.42-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4ebe48e..88e3266 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 2.1.41
+Version: 2.1.42
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -785,6 +785,33 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Sep 16 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.42-1
+- Workaround bug in MockHttpServletRequest - asking for a param that doesn't
+ exist shouldn't assert()
+- VirtualGuestsActionTest: do not rely ontranslation messages
+- ProvisionVirtualizationWizardActionTest:preconditions
+- SystemEntitlementsSetupActionTest: do not assume Org has virtualization
+ entitlement
+- Add support for uploaded files in mockedrequests, fix
+ CryptoKeyCreateActionTest
+- OrgSoftwareSubscriptionsActionTest: always create test channel families
+- MethodsSetupActionTest: do not assume that method command exists
+- KickstartScriptActionTest: missingparameters added
+- junit tests: some logging cleanups
+- Make taskomatic maxmemory configurable in rhn.conf
+- TestUtils: use the same temporaryfilename for the same file
+- junit tests: do not rely on Cobbler
+- VirtualGuestsActionTest: do not rely on query string parameter ordering
+- OrgHandlerTest: don't depend on a channel family with free entitlement slots
+- ActivationKeyHandlerTest: expect correct exceptions
+- AuthFilterTest: mocked request object updated
+- MasterHandlerTest: handlegetDefaultMaster exceptions
+- DownloadActionTest: do not assume file tobe downloaded exists
+- Frontend monitoring tests: ensure aMonitoring Scout exists
+- RequestContext.buildPageLink: forceparameter ordering
+- 580995 - typo fix + clarify meaning
+- Cleaning up more Junits
+
* Tue Sep 10 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.41-1
- 580995 - updating api doc
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 0bab5f7..94b6475 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-2.1.41-1 java/
+2.1.42-1 java/
10 years, 8 months
Changes to 'refs/tags/spacewalk-reports-2.1.9-1'
by Tomáš Kašpárek
Tag 'spacewalk-reports-2.1.9-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-09-16 09:06 +0000
Tagging package [spacewalk-reports] version [2.1.9-1] in directory [reporting/].
Changes since spacewalk-reports-2.1.8-1:
Michael Calmer (1):
Fix field length of erratum-advisory-name to match real DB field length
Tomas Kasparek (2):
1008309 - further imporove postgresql performance
Automatic commit of package [spacewalk-reports] release [2.1.9-1].
---
backend/satellite_tools/exporter/exportLib.py | 2 +-
rel-eng/packages/spacewalk-reports | 2 +-
reporting/reports/data/packages-updates-newest | 2 +-
reporting/spacewalk-reports.spec | 5 ++++-
4 files changed, 7 insertions(+), 4 deletions(-)
---
10 years, 8 months