spacewalk-commits March 2012

spacewalk-commits@lists.fedorahosted.org

10 participants
371 discussions

Changes to 'refs/tags/spacewalk-search-1.8.1-1'
by Miroslav Suchý 17 Mar '12

17 Mar '12

Tag 'spacewalk-search-1.8.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-03-17 17:59 +0000 Tagging package [spacewalk-search] version [1.8.1-1] in directory [search-server/spacewalk-search/]. Changes since spacewalk-java-1.8.20-1: Miroslav Suchý (1): Automatic commit of package [spacewalk-search] release [1.8.1-1]. --- rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

Changes to 'refs/tags/spacewalk-java-1.8.20-1'
by Miroslav Suchý 17 Mar '12

17 Mar '12

Tag 'spacewalk-java-1.8.20-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2012-03-17 17:58 +0000 Tagging package [spacewalk-java] version [1.8.20-1] in directory [java/]. Changes since spacewalk-java-1.8.19-1: Miroslav Suchý (2): 521248 - correctly spell MHz Automatic commit of package [spacewalk-java] release [1.8.20-1]. --- java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java | 4 +- java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java | 14 +++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2 - java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 2 - java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 2 - java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 2 - java/spacewalk-java.spec | 5 ++ rel-eng/packages/spacewalk-java | 2 - search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 2 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/Server.java | 18 +++++----- search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java | 2 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java | 4 +- search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ServerDocumentBuilder.java | 2 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSystemsTask.java | 2 - 26 files changed, 58 insertions(+), 55 deletions(-) ---

1 0

3 commits - java/code java/spacewalk-java.spec rel-eng/packages search-server/spacewalk-search
by Miroslav Suchý 17 Mar '12

17 Mar '12

java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java | 4 +- java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java | 14 +++---- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 2 - java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 6 +-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 2 - java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 4 +- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 2 - java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 2 - java/spacewalk-java.spec | 5 ++ rel-eng/packages/spacewalk-java | 2 - rel-eng/packages/spacewalk-search | 2 - search-server/spacewalk-search/spacewalk-search.spec | 6 ++- search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml | 2 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/Server.java | 18 +++++----- search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java | 2 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java | 4 +- search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ServerDocumentBuilder.java | 2 - search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSystemsTask.java | 2 - 28 files changed, 64 insertions(+), 57 deletions(-) New commits: commit ce531ffcab98f10ecf88104fb5bc6bd6d83e424e Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Sat Mar 17 18:59:26 2012 +0100 Automatic commit of package [spacewalk-search] release [1.8.1-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index ac47deb..0588806 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -1.7.3-1 search-server/spacewalk-search/ +1.8.1-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index ea7874b..a1c00d4 100644 --- a/search-server/spacewalk-search/spacewalk-search.spec +++ b/search-server/spacewalk-search/spacewalk-search.spec @@ -4,7 +4,7 @@ Name: spacewalk-search Summary: Spacewalk Full Text Search Server Group: Applications/Internet License: GPLv2 -Version: 1.8.0 +Version: 1.8.1 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -124,6 +124,10 @@ fi %{_sysconfdir}/logrotate.d/rhn-search %changelog +* Sat Mar 17 2012 Miroslav Suchý 1.8.1-1 +- 521248 - correctly spell MHz (msuchy(a)redhat.com) +- Bumping package versions for 1.8. (jpazdziora(a)redhat.com) + * Fri Mar 02 2012 Jan Pazdziora 1.7.3-1 - Update the copyright year info. commit d4bbaa8d47d5602d34d19da1bea282e71ea6e34f Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Sat Mar 17 18:58:57 2012 +0100 Automatic commit of package [spacewalk-java] release [1.8.20-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 35fb8f7..8e2863e 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.19 +Version: 1.8.20 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -593,6 +593,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Sat Mar 17 2012 Miroslav Suchý 1.8.20-1 +- 521248 - correctly spell MHz (msuchy(a)redhat.com) + * Fri Mar 16 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.19-1 - 802400 - fix ISE on rhn/admin/multiorg/OrgSoftwareSubscriptions.do page (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index b8ba95e..a7edee6 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.19-1 java/ +1.8.20-1 java/ commit d412dbfc15d18554a33a018efc72096f2dcb7c02 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Sat Mar 17 18:43:02 2012 +0100 521248 - correctly spell MHz diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java index 5191d0f..753f949 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/SystemSearchHelper.java @@ -292,11 +292,11 @@ public class SystemSearchHelper { index = SERVER_INDEX; } else if (CPU_MHZ_LT.equals(mode)) { - query = "cpuMhz:[0 TO " + terms + "]"; + query = "cpuMHz:[0 TO " + terms + "]"; index = SERVER_INDEX; } else if (CPU_MHZ_GT.equals(mode)) { - query = "cpuMhz:[" + terms + " TO " + Long.MAX_VALUE + "]"; + query = "cpuMHz:[" + terms + " TO " + Long.MAX_VALUE + "]"; index = SERVER_INDEX; } else if (NUM_CPUS_LT.equals(mode)) { diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java b/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java index 4c17dec..83814d8 100644 --- a/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java +++ b/java/code/src/com/redhat/rhn/frontend/dto/SystemSearchResult.java @@ -34,7 +34,7 @@ public class SystemSearchResult extends SystemOverview { private String description; private String runningKernel; private Long cpuNumberOfCpus; - private String cpuMhz; + private String cpuMHz; private String cpuModel; private String dmiSystem; private String dmiBiosVendor; @@ -211,17 +211,17 @@ public class SystemSearchResult extends SystemOverview { } /** - * @return the cpuMhz + * @return the cpuMHz */ - public String getCpuMhz() { - return cpuMhz; + public String getCpuMHz() { + return cpuMHz; } /** - * @param cpuMhzIn the cpuMhz to set + * @param cpuMHzIn the cpuMHz to set */ - public void setCpuMhz(String cpuMhzIn) { - this.cpuMhz = cpuMhzIn; + public void setCpuMHz(String cpuMHzIn) { + this.cpuMHz = cpuMHzIn; } /** diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml index fd981d1..3c8e252 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml @@ -2621,11 +2621,11 @@ available for this kickstart profile to function properly. <target>CPU MHz চিহ্নিত মান থেকে কম</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz চিহ্নিত মান থেকে অধিক</target></trans-unit> + <target>CPU MHz চিহ্নিত মান থেকে অধিক</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml index bbe6ffe..0ea124c 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml @@ -2646,11 +2646,11 @@ verfügbar machen, damit dieses Kickstart-Profil einwandfrei funktionieren kann. <target>CPU MHz weniger als</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz mehr als</target></trans-unit> + <target>CPU MHz mehr als</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> 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 b3d4c77..a66aaf1 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 @@ -2666,7 +2666,7 @@ available for this kickstart profile to function properly. </trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml index 3098add..d09d201 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml @@ -2640,11 +2640,11 @@ asegurarse de que estén disponibles para que este perfil kickstart funcione apr <target>CPU MHz menor que</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz mayor que</target></trans-unit> + <target>CPU MHz mayor que</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml index 82b848b..359cf68 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml @@ -2639,14 +2639,14 @@ disponibles pour que ce profil kickstart puisse fonctionner correctement. <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>Mhz du CPU inférieurs à</target></trans-unit> + <target>MHz du CPU inférieurs à</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>Mhz du CPU supérieurs à</target></trans-unit> + <target>MHz du CPU supérieurs à</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml index 5a263ca..6dedbd2 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml @@ -2615,11 +2615,11 @@ available for this kickstart profile to function properly. <target>CPU MHz કરતાં ઓછી</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz કરતાં વધુ</target></trans-unit> + <target>CPU MHz કરતાં વધુ</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml index 74868c2..4a09e24 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml @@ -2615,11 +2615,11 @@ available for this kickstart profile to function properly. <target>CPU MHz इससे कम</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz इससे ज्यादा</target></trans-unit> + <target>CPU MHz इससे ज्यादा</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml index 8e768e4..cc3d2ec 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml @@ -2639,11 +2639,11 @@ disponibili per un corretto funzionamento di questo profilo kickstart. <target>CPU MHz Minore di</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz Maggiore di</target></trans-unit> + <target>CPU MHz Maggiore di</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml index aa64ca3..fe8cde0 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml @@ -2639,11 +2639,11 @@ rhn-kickstart* パッケージが利用可能であることを確認します <target>CPU MHz が指定値未満のもの</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz が指定値を超えるもの</target></trans-unit> + <target>CPU MHz が指定値を超えるもの</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml index 1fa9022..9dbb9d7 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml @@ -2615,11 +2615,11 @@ available for this kickstart profile to function properly. <target>CPU MHz 이하</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz 이상</target></trans-unit> + <target>CPU MHz 이상</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml index 9b625cc..06b0ad4 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml @@ -2617,11 +2617,11 @@ available for this kickstart profile to function properly. <target>CPU MHz ਇਸ ਤੋਂ ਘੱਟ</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz ਇਸ ਤੋਂ ਵੱਧ</target></trans-unit> + <target>CPU MHz ਇਸ ਤੋਂ ਵੱਧ</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml index 0770db5..e00c961 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml @@ -2629,11 +2629,11 @@ disponíveis para seu perfil kickstart funcionar corretamente./n</li> <target>CPU MHz Menor do que</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz Maior do que</target></trans-unit> + <target>CPU MHz Maior do que</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml index 55517e7..0f24776 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml @@ -2615,7 +2615,7 @@ available for this kickstart profile to function properly. <target>Частота процессора (МГц) меньше чем</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml index 7b5a07c..ee0abb5 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml @@ -2615,11 +2615,11 @@ available for this kickstart profile to function properly. <target>CPU MHz குறைபட்சம்</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> - <target>CPU Mhz அதிகபட்சம்</target></trans-unit> + <target>CPU MHz அதிகபட்சம்</target></trans-unit> <trans-unit id="systemsearch_num_of_cpus_lt"> <source>Number of CPUs Less Than</source> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml index b66b3e0..6d4acd6 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml @@ -2640,7 +2640,7 @@ available for this kickstart profile to function properly. <target>CPU 频率小于</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml index d4eaee5..c1264d8 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml @@ -2615,7 +2615,7 @@ available for this kickstart profile to function properly. <target>中央處理器 MHz 小於</target></trans-unit> <trans-unit id="systemsearch_cpu_mhz_gt"> - <source>CPU Mhz Greater Than</source> + <source>CPU MHz Greater Than</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/Search</context> </context-group> diff --git a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml index 2fd3554..535bcbb 100644 --- a/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml +++ b/search-server/spacewalk-search/src/config/com/redhat/satellite/search/db/server.xml @@ -35,7 +35,7 @@ cpu.bogomips as cpuBogoMIPS, cpu.cache as cpuCache, cpu.family as cpuFamily, - cpu.mhz as cpuMhz, + cpu.mhz as cpuMHz, cpu.stepping as cpuStepping, cpu.flags as cpuFlags, cpu.model as cpuModel, diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/Server.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/Server.java index 1f72c86..343bba8 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/Server.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/Server.java @@ -60,7 +60,7 @@ public class Server extends GenericRecord { private String cpuBogoMIPS; private String cpuCache; private String cpuFamily; - private String cpuMhz; + private String cpuMHz; private String cpuStepping; private String cpuFlags; private String cpuModel; @@ -452,21 +452,21 @@ public class Server extends GenericRecord { } /** - * @return the cpuMhz + * @return the cpuMHz */ - public String getCpuMhz() { - return cpuMhz; + public String getCpuMHz() { + return cpuMHz; } /** - * @param cpuMhzIn the cpuMhz to set + * @param cpuMHzIn the cpuMHz to set */ - public void setCpuMhz(String cpuMhzIn) { - if (cpuMhzIn != null) { - this.cpuMhz = NumberTools.longToString(Long.parseLong(cpuMhzIn)); + public void setCpuMHz(String cpuMHzIn) { + if (cpuMHzIn != null) { + this.cpuMHz = NumberTools.longToString(Long.parseLong(cpuMHzIn)); } else { - this.cpuMhz = null; + this.cpuMHz = null; } } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java index 5985a27..9f9667c 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/IndexManager.java @@ -734,7 +734,7 @@ public class IndexManager { analyzer.addAnalyzer("registered", new KeywordAnalyzer()); analyzer.addAnalyzer("ram", new KeywordAnalyzer()); analyzer.addAnalyzer("swap", new KeywordAnalyzer()); - analyzer.addAnalyzer("cpuMhz", new KeywordAnalyzer()); + analyzer.addAnalyzer("cpuMHz", new KeywordAnalyzer()); analyzer.addAnalyzer("cpuNumberOfCpus", new KeywordAnalyzer()); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java index b3400d8..1c68ea1 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/MatchingField.java @@ -54,9 +54,9 @@ public class MatchingField { terms = new Term[0]; } needNumberToolsAdjust = new HashMap(); - needNumberToolsAdjust.put("cpuMhz", true); + needNumberToolsAdjust.put("cpuMHz", true); needNumberToolsAdjust.put("cpuBogoMIPS", true); - needNumberToolsAdjust.put("cpuMhz", true); + needNumberToolsAdjust.put("cpuMHz", true); needNumberToolsAdjust.put("cpuNumberOfCpus", true); needNumberToolsAdjust.put("ram", true); needNumberToolsAdjust.put("swap", true); diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ServerDocumentBuilder.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ServerDocumentBuilder.java index 1edf660..764bba6 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ServerDocumentBuilder.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/index/builder/ServerDocumentBuilder.java @@ -58,7 +58,7 @@ public class ServerDocumentBuilder implements DocumentBuilder { } else if (name.equals("checkin") || name.equals("registered") || name.equals("ram") || name.equals("swap") || - name.equals("cpuMhz") | name.equals("cpuNumberOfCpus")) { + name.equals("cpuMHz") | name.equals("cpuNumberOfCpus")) { store = Field.Store.YES; tokenize = Field.Index.UN_TOKENIZED; } diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSystemsTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSystemsTask.java index 3427e85..3518541 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSystemsTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexSystemsTask.java @@ -72,7 +72,7 @@ public class IndexSystemsTask extends GenericIndexTask { attrs.put("cpuBogoMIPs", srvr.getCpuBogoMIPS()); attrs.put("cpuCache", srvr.getCpuCache()); attrs.put("cpuFamily", srvr.getCpuFamily()); - attrs.put("cpuMhz", srvr.getCpuMhz()); + attrs.put("cpuMHz", srvr.getCpuMHz()); attrs.put("cpuStepping", srvr.getCpuStepping()); attrs.put("cpuFlags", srvr.getCpuFlags()); attrs.put("cpuModel", srvr.getCpuModel());

1 0

Changes to 'refs/tags/spacewalk-java-1.8.19-1'
by Tomas Lestach 16 Mar '12

16 Mar '12

Tag 'spacewalk-java-1.8.19-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-03-16 17:57 +0000 Tagging package [spacewalk-java] version [1.8.19-1] in directory [java/]. Changes since spacewalk-java-1.8.18-1: Tomas Lestach (2): 802400 - fix ISE on rhn/admin/multiorg/OrgSoftwareSubscriptions.do page Automatic commit of package [spacewalk-java] release [1.8.19-1]. --- java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java | 3 --- java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) ---

1 0

2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 16 Mar '12

16 Mar '12

java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java | 3 --- java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) New commits: commit e7058c74bcf4fef1c1c8c84c187e75372786ecd1 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Mar 16 18:57:51 2012 +0100 Automatic commit of package [spacewalk-java] release [1.8.19-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 65cbf31..35fb8f7 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.18 +Version: 1.8.19 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -593,6 +593,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Mar 16 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.19-1 +- 802400 - fix ISE on rhn/admin/multiorg/OrgSoftwareSubscriptions.do page + (tlestach(a)redhat.com) + * Fri Mar 16 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.18-1 - 803353 - do not link documentation if not available (tlestach(a)redhat.com) - 803353 - do not link documentation if not available (tlestach(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index afa6b1e..b8ba95e 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.18-1 java/ +1.8.19-1 java/ commit 532a0713ddc9a1456695d6bcede0b755cf9fa1d3 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Mar 16 18:57:24 2012 +0100 802400 - fix ISE on rhn/admin/multiorg/OrgSoftwareSubscriptions.do page diff --git a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java index 030bafd..373e5bf 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/multiorg/OrgSoftwareSubscriptionsAction.java @@ -29,7 +29,6 @@ import com.redhat.rhn.frontend.taglibs.list.helper.Listable; import com.redhat.rhn.manager.channel.ChannelManager; import com.redhat.rhn.manager.org.UpdateOrgSoftwareEntitlementsCommand; -import org.apache.commons.lang.StringUtils; import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; @@ -167,7 +166,6 @@ public class OrgSoftwareSubscriptionsAction extends RhnAction implements Listabl private Long processCount(String count, ActionErrors errors, ChannelFamily cfm) { - if (!StringUtils.isBlank(count)) { // check for invalid number format try { return Long.parseLong(count.trim()); @@ -175,7 +173,6 @@ public class OrgSoftwareSubscriptionsAction extends RhnAction implements Listabl catch (NumberFormatException ex) { ValidatorException.raiseException("orgsoftwaresubs.invalid", cfm.getName()); } - } return null; }

1 0

Changes to 'refs/tags/spacewalk-java-1.8.18-1'
by Tomas Lestach 16 Mar '12

16 Mar '12

Tag 'spacewalk-java-1.8.18-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-03-16 16:55 +0000 Tagging package [spacewalk-java] version [1.8.18-1] in directory [java/]. Changes since spacewalk-backend-1.8.5-1: Tomas Lestach (3): 803353 - do not link documentation if not available 803353 - do not link documentation if not available Automatic commit of package [spacewalk-java] release [1.8.18-1]. --- java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java | 9 +++++++- java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 2 + java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 7 ++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 11 ++++++++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 7 ------ java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5 +++- java/spacewalk-java.spec | 11 +++++++++- rel-eng/packages/spacewalk-java | 2 - 22 files changed, 41 insertions(+), 111 deletions(-) ---

1 0

3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 16 Mar '12

16 Mar '12

java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java | 9 +++++++- java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java | 2 + java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 7 ++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 11 ++++++++-- java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 7 ------ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 7 ------ java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp | 5 +++- java/spacewalk-java.spec | 11 +++++++++- rel-eng/packages/spacewalk-java | 2 - 22 files changed, 41 insertions(+), 111 deletions(-) New commits: commit 9da7d8763bbe1982c2cfc3290d3cdc476cf36c62 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Mar 16 17:55:26 2012 +0100 Automatic commit of package [spacewalk-java] release [1.8.18-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index f7e6b62..65cbf31 100644 --- a/java/spacewalk-java.spec +++ b/java/spacewalk-java.spec @@ -22,7 +22,7 @@ Name: spacewalk-java Summary: Spacewalk Java site packages Group: Applications/Internet License: GPLv2 -Version: 1.8.17 +Version: 1.8.18 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -593,6 +593,15 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Fri Mar 16 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.18-1 +- 803353 - do not link documentation if not available (tlestach(a)redhat.com) +- 803353 - do not link documentation if not available (tlestach(a)redhat.com) +- 800364 - hide documetation link (tlestach(a)redhat.com) +- 803644 - fix ISE (tlestach(a)redhat.com) +- fix checkstyle issue (tlestach(a)redhat.com) +- get rid of gsbase (tlestach(a)redhat.com) +- 726114 - update createOrUpradePath api documentation (tlestach(a)redhat.com) + * Fri Mar 16 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.17-1 - require checkstyle only if we run it diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 48111c5..afa6b1e 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.17-1 java/ +1.8.18-1 java/ commit 8296d298c62ca9970aab39b5ff366885840e68d4 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Mar 16 17:48:34 2012 +0100 803353 - do not link documentation if not available diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java index 1262262..32f0005 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemDetailsEditAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.systems.sdc; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.common.validator.ValidatorError; import com.redhat.rhn.common.validator.ValidatorResult; @@ -282,9 +283,15 @@ public class SystemDetailsEditAction extends RhnAction { } if (e instanceof VirtualizationEntitlement) { log.debug("adding virt msg"); - createSuccessMessage(request, + if (ConfigDefaults.get().isDocAvailable()) { + createSuccessMessage(request, "system.entitle.addedvirtualization", "/rhn/help/reference/en-US/ch-virtualization.jsp"); + } + else { + createSuccessMessage(request, + "system.entitle.addedvirtualization.nodoc", null); + } } } } 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 18dc4fb..b3d4c77 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 @@ -7263,6 +7263,13 @@ Follow this url to see the full list of inactive systems: </context-group> </trans-unit> + <trans-unit id="system.entitle.addedvirtualization.nodoc"> +<source>Since you added a Virtualization entitlement to the system we also performed some extra steps to ensure your system will be able to manage virtual guests better.</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/details/Overview.do</context> + </context-group> + </trans-unit> + <trans-unit id="system.entitle.alreadyvirt"> <source>A system can have either the Virtualization or Virtualization Platform entitlement but not both.</source> <context-group name="ctx"> commit f205ffeb04e219faf9d5595063ea4808700268ba Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Mar 16 17:26:36 2012 +0100 803353 - do not link documentation if not available diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java index ef07d49..fc6ce5b 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/systems/sdc/SystemOverviewAction.java @@ -14,6 +14,7 @@ */ package com.redhat.rhn.frontend.action.systems.sdc; +import com.redhat.rhn.common.conf.ConfigDefaults; import com.redhat.rhn.common.db.datasource.DataResult; import com.redhat.rhn.common.localization.LocalizationService; import com.redhat.rhn.domain.action.Action; @@ -119,6 +120,7 @@ public class SystemOverviewAction extends RhnAction { request.setAttribute("unentitled", Boolean.valueOf(s.getEntitlements().isEmpty())); request.setAttribute("systemInactive", Boolean.valueOf(s.isInactive())); + request.setAttribute("documentation", ConfigDefaults.get().isDocAvailable()); request.setAttribute("criticalErrataCount", criticalErrataCount); request.setAttribute("nonCriticalErrataCount", nonCriticalErrataCount); request.setAttribute("upgradablePackagesCount", upgradablePackagesCount); 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 5d44845..c5223e8 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 @@ -16815,13 +16815,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">প্যাকেজ: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>সিস্টেমটি @@PRODUCT_NAME@@-র সাথে সংযোগ স্থাপন করছে না (<a href="{0}">অতিরিক্ত তথ্য</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 921118c..3549e97 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 @@ -16868,13 +16868,6 @@ Baumpfad, Kickstart-RPM, Basis-Channel und Installer-Generation sollten immer ü </context-group> <target><a href="{0}">Pakete: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>System meldet sich nicht bei @@PRODUCT_NAME@@ an (<a href="{0}">weitere Info</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 e1b9307..364d865 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 @@ -17364,8 +17364,15 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> </trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> + <trans-unit id="sdc.details.overview.inactive1"> + <source>System not checking in with @@PRODUCT_NAME@@</source> + <context-group name="ctx"> + <context context-type="sourcefile">/systems/details/Overview.do</context> + </context-group> + </trans-unit> + + <trans-unit id="sdc.details.overview.inactive2"> + <source> (<a href="{0}">more info</a>)</source> <context-group name="ctx"> <context context-type="sourcefile">/systems/details/Overview.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 e52c289..ae1fe62 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 @@ -16864,13 +16864,6 @@ La ruta del ábol, el RPM Kickstart, el canal base y la generación del instalad </context-group> <target><a href="{0}">Paquetes: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>El sistema no se está conectando con @@PRODUCT_NAME@@ (<a href="{0}">mayor información</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 cebe4d4..209ce2f 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 @@ -16866,13 +16866,6 @@ Le chemin d'arborescence, le RPM Kickstart, le canal de base, et la génération </context-group> <target><a href="{0}">Paquetages : </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>Système non connecté à @@PRODUCT_NAME@@ (<a href="{0}">plus d'informations</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 f570c20..e240280 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 @@ -16817,13 +16817,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">પેકેજો: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>સિસ્ટમ @@PRODUCT_NAME@@ માં ચકાસી રહી નથી (<a href="{0}">વધુ જાણકારી</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 3e2816a..d864979 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 @@ -16817,13 +16817,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">संकुल: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>सिस्टम इसे @@PRODUCT_NAME@@ के साथ चेक नहीं कर रहा है (<a href="{0}">अधिक सूचना</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 16870f7..864f416 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 @@ -16814,13 +16814,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">Pacchetti: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>Il sistema non esegue il check in con @@PRODUCT_NAME@@ (<a href="{0}">maggiori informazioni</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 dafdf9d..20bd1e5 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 @@ -16847,13 +16847,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">パッケージ: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>システムが @@PRODUCT_NAME@@ にチェックインしていません (<a href="{0}">詳細</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 24e9f06..5a4f96c 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 @@ -16810,13 +16810,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">패키지: </a> {1} </target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>@@PRODUCT_NAME@@을 사용하여 시스템을 접속할 수 없음 (<a href="{0}">자세한 정보</a>) </target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 ac222a8..cc8ebe6 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 @@ -16816,13 +16816,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">ਪੈਕੇਜ: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>ਸਿਸਟਮ @@PRODUCT_NAME@@ ਤੇ ਦਾਖਲ ਨਹੀਂ ਹੋਇਆ (<a href="{0}">ਵਧੇਰੇ ਜਾਣਕਾਰੀ</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 e608fe7..14521df 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 @@ -16858,13 +16858,6 @@ O Caminho de Árvore, Kickstart RPM, Canal de Base e a Geração do Instalador d </context-group> <target><a href="{0}">Pacotes: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>Sistema não está fazendo o check in com o @@PRODUCT_NAME@@ (<a href="{0}">mais info</a>) </target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 a7b8a29..7f49d26 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 @@ -16811,13 +16811,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">Пакеты: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>Система не авторизуется в @@PRODUCT_NAME@@ (<a href="{0}">Подробнее...</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 b29aa16..95188f2 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 @@ -16817,13 +16817,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">தொகுப்புகள்: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>@@PRODUCT_NAME@@உடன் சரிபார்க்காத கணினி (<a href="{0}">கூடுதல் தகவல்</a>)</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 e258a4a..f571711 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 @@ -16860,13 +16860,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">Packages: </a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>系统没有检入 @@PRODUCT_NAME@@（<a href="{0}">更多信息</a>）</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> 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 e56349d..4bb36f6 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 @@ -16812,13 +16812,6 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa </context-group> <target><a href="{0}">套件：</a> {1}</target></trans-unit> - <trans-unit id="sdc.details.overview.inactive"> - <source>System not checking in with @@PRODUCT_NAME@@ (<a href="{0}">more info</a>)</source> - <context-group name="ctx"> - <context context-type="sourcefile">/systems/details/Overview.do</context> - </context-group> - <target>系統未登錄於 @@PRODUCT_NAME@@ 之中（<a href="{0}">更多資訊</a>）</target></trans-unit> - <trans-unit id="sdc.details.overview.unentitled"> <source>System not entitled (<a href="{0}">entitle it here</a>)</source> <context-group name="ctx"> diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp index be05d58..40d220b 100644 --- a/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp +++ b/java/code/webapp/WEB-INF/pages/systems/sdc/overview.jsp @@ -17,7 +17,10 @@ </c:when> <c:when test="${systemInactive}"> - <img src="/img/icon_checkin.gif"/> <bean:message key="sdc.details.overview.inactive" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> + <img src="/img/icon_checkin.gif"/> <bean:message key="sdc.details.overview.inactive1"/> + <c:if test="${documentation == 'true'}"> + <bean:message key="sdc.details.overview.inactive2" arg0="/rhn/help/reference/en-US/s1-sm-systems.jsp#s2-sm-system-list"/> + </c:if> </c:when> <c:when test="${hasUpdates}">

1 0

Changes to 'refs/tags/spacewalk-backend-1.8.5-1'
by Jan Pazdziora 16 Mar '12

16 Mar '12

Tag 'spacewalk-backend-1.8.5-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-16 16:37 +0000 Tagging package [spacewalk-backend] version [1.8.5-1] in directory [backend/]. Changes since spacewalk-backend-1.8.4-1: Jan Pazdziora (2): 804036 - need to use timestamp datatype to preserve the precision. Automatic commit of package [spacewalk-backend] release [1.8.5-1]. Tomas Lestach (1): 800364 - hide documetation link --- backend/server/rhnServer/server_packages.py | 2 +- backend/spacewalk-backend.spec | 5 ++++- java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 8 ++++++++ java/code/src/com/redhat/rhn/frontend/action/renderers/TasksRenderer.java | 3 ++- java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/tasks.jsp | 3 ++- rel-eng/packages/spacewalk-backend | 2 +- 6 files changed, 18 insertions(+), 5 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora 16 Mar '12

16 Mar '12

backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 4107c8f3a9e39bc17005fc77b583ed2dbe10a351 Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Mar 16 17:37:19 2012 +0100 Automatic commit of package [spacewalk-backend] release [1.8.5-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index bfdaa39..a0b9366 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 1.8.4 +Version: 1.8.5 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -688,6 +688,9 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Fri Mar 16 2012 Jan Pazdziora 1.8.5-1 +- 804036 - need to use timestamp datatype to preserve the precision. + * Fri Mar 16 2012 Jan Pazdziora 1.8.4-1 - 802688 - Forcing empty strings to be Nones. diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index e8876a7..05e996d 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.8.4-1 backend/ +1.8.5-1 backend/

1 0

backend/server
by Jan Pazdziora 16 Mar '12

16 Mar '12

backend/server/rhnServer/server_packages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 2dca8e92f7066b4391b4dd2b5985cbbd1cddbaea Author: Jan Pazdziora <jpazdziora(a)redhat.com> Date: Fri Mar 16 17:36:48 2012 +0100 804036 - need to use timestamp datatype to preserve the precision. diff --git a/backend/server/rhnServer/server_packages.py b/backend/server/rhnServer/server_packages.py index 31545d1..394c8e7 100644 --- a/backend/server/rhnServer/server_packages.py +++ b/backend/server/rhnServer/server_packages.py @@ -205,7 +205,7 @@ class Packages: insert into rhnServerPackage (server_id, name_id, evr_id, package_arch_id, installtime) values (:sysid, LOOKUP_PACKAGE_NAME(:n), LOOKUP_EVR(:e, :v, :r), - LOOKUP_PACKAGE_ARCH(:a), TO_DATE(:instime, 'YYYY-MM-DD HH24:MI:SS') + LOOKUP_PACKAGE_ARCH(:a), TO_TIMESTAMP(:instime, 'YYYY-MM-DD HH24:MI:SS') ) """) # some fields are not allowed to contain empty string (varchar)

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits March 2012