spacewalk-commits November 2013

spacewalk-commits@lists.fedorahosted.org

9 participants
202 discussions

Changes to 'refs/tags/spacewalk-java-2.1.76-1'
by Tomas Lestach 18 Nov '13

18 Nov '13

Tag 'spacewalk-java-2.1.76-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-11-18 09:11 +0000 Tagging package [spacewalk-java] version [2.1.76-1] in directory [java/]. Changes since spacewalk-branding-2.1.8-1: Tomas Lestach (1): Automatic commit of package [spacewalk-java] release [2.1.76-1]. --- java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 18 Nov '13

18 Nov '13

java/spacewalk-java.spec | 6 +++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 1fe71e3a677c4c9edd74446361481f09c28f4f0f Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Nov 18 10:11:03 2013 +0100 Automatic commit of package [spacewalk-java] release [2.1.76-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index 3e9aee9..e1e1cf6 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.75 +Version: 2.1.76 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -785,6 +785,10 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Mon Nov 18 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.76-1 +- replace 'Channel Managemet Guide' docs with 'User Guide' and 'Getting Started + Guide' + * Fri Nov 15 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.75-1 - polishing changelog diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 3d083bf..6bc4a46 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -2.1.75-1 java/ +2.1.76-1 java/

1 0

Changes to 'refs/tags/spacewalk-branding-2.1.8-1'
by Tomas Lestach 18 Nov '13

18 Nov '13

Tag 'spacewalk-branding-2.1.8-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-11-18 09:10 +0000 Tagging package [spacewalk-branding] version [2.1.8-1] in directory [branding/]. Changes since spacewalk-web-2.1.32-1: Tomas Lestach (1): Automatic commit of package [spacewalk-branding] release [2.1.8-1]. --- branding/spacewalk-branding.spec | 7 ++++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) ---

1 0

branding/spacewalk-branding.spec rel-eng/packages
by Tomas Lestach 18 Nov '13

18 Nov '13

branding/spacewalk-branding.spec | 7 ++++++- rel-eng/packages/spacewalk-branding | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) New commits: commit 8db659a05c78ba3d588feec546862c6dc310ea01 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Nov 18 10:10:33 2013 +0100 Automatic commit of package [spacewalk-branding] release [2.1.8-1]. diff --git a/branding/spacewalk-branding.spec b/branding/spacewalk-branding.spec index 7fadcd5..d9543e3 100644 --- a/branding/spacewalk-branding.spec +++ b/branding/spacewalk-branding.spec @@ -9,7 +9,7 @@ %endif Name: spacewalk-branding -Version: 2.1.7 +Version: 2.1.8 Release: 1%{?dist} Summary: Spacewalk branding data @@ -82,6 +82,11 @@ rm -rf %{buildroot} %doc LICENSE %changelog +* Mon Nov 18 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.8-1 +- point Spacewalk documentation to Red Hat Satellite 5.6 documentation +- replace 'Channel Managemet Guide' docs with 'User Guide' and 'Getting Started + Guide' + * Fri Nov 15 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.7-1 - polishing changelog diff --git a/rel-eng/packages/spacewalk-branding b/rel-eng/packages/spacewalk-branding index 4878d2a..1ade129 100644 --- a/rel-eng/packages/spacewalk-branding +++ b/rel-eng/packages/spacewalk-branding @@ -1 +1 @@ -2.1.7-1 branding/ +2.1.8-1 branding/

1 0

Changes to 'refs/tags/spacewalk-web-2.1.32-1'
by Tomas Lestach 18 Nov '13

18 Nov '13

Tag 'spacewalk-web-2.1.32-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-11-18 09:10 +0000 Tagging package [spacewalk-web] version [2.1.32-1] in directory [web/]. Changes since spacewalk-backend-2.1.35-1: Tomas Lestach (3): replace 'Channel Managemet Guide' docs with 'User Guide' and 'Getting Started Guide' point Spacewalk documentation to Red Hat Satellite 5.6 documentation Automatic commit of package [spacewalk-web] release [2.1.32-1]. --- branding/conf/rhn_docs.conf | 11 ++++--- java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 3 +- java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java | 9 ++++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 12 ++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 12 ++++++++ java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 7 +++- java/code/webapp/WEB-INF/nav/sitenav.xml | 7 +++- java/code/webapp/WEB-INF/pages/help/helpindex.jsp | 15 +++++++--- rel-eng/packages/spacewalk-web | 2 - web/include/nav/sitenav-authenticated.xml | 7 +++- web/include/nav/sitenav.xml | 7 +++- web/spacewalk-web.spec | 6 +++- 12 files changed, 76 insertions(+), 22 deletions(-) ---

1 0

3 commits - branding/conf java/code rel-eng/packages web/include web/spacewalk-web.spec
by Tomas Lestach 18 Nov '13

18 Nov '13

branding/conf/rhn_docs.conf | 11 ++++--- java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 3 +- java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java | 9 ++++-- java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 12 ++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 12 ++++++++ java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml | 7 +++- java/code/webapp/WEB-INF/nav/sitenav.xml | 7 +++- java/code/webapp/WEB-INF/pages/help/helpindex.jsp | 15 +++++++--- rel-eng/packages/spacewalk-web | 2 - web/include/nav/sitenav-authenticated.xml | 7 +++- web/include/nav/sitenav.xml | 7 +++- web/spacewalk-web.spec | 6 +++- 12 files changed, 76 insertions(+), 22 deletions(-) New commits: commit 1ff3c3e15d166354b1446d2db03456dc1bcf61f1 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Nov 18 10:10:16 2013 +0100 Automatic commit of package [spacewalk-web] release [2.1.32-1]. diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web index 77fb00a..d9dcc4e 100644 --- a/rel-eng/packages/spacewalk-web +++ b/rel-eng/packages/spacewalk-web @@ -1 +1 @@ -2.1.31-1 web/ +2.1.32-1 web/ diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec index 378042a..3c42125 100644 --- a/web/spacewalk-web.spec +++ b/web/spacewalk-web.spec @@ -4,7 +4,7 @@ Name: spacewalk-web Summary: Spacewalk Web site - Perl modules Group: Applications/Internet License: GPLv2 -Version: 2.1.31 +Version: 2.1.32 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk/ Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -269,6 +269,10 @@ rm -rf $RPM_BUILD_ROOT %doc LICENSE %changelog +* Mon Nov 18 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.32-1 +- replace 'Channel Managemet Guide' docs with 'User Guide' and 'Getting Started + Guide' + * Fri Nov 15 2013 Tomas Kasparek <tkasparek(a)redhat.com> 2.1.31-1 - polishing changelog - making db-control work with pg 9.2 from rhscl commit 7cd512be8424e2ebeeb77a1c76510596edac023b Author: Tomas Lestach <tlestach(a)redhat.com> Date: Mon Nov 18 09:51:37 2013 +0100 point Spacewalk documentation to Red Hat Satellite 5.6 documentation diff --git a/branding/conf/rhn_docs.conf b/branding/conf/rhn_docs.conf index 9840cab..d1a97be 100644 --- a/branding/conf/rhn_docs.conf +++ b/branding/conf/rhn_docs.conf @@ -1,7 +1,7 @@ -docs.reference_guide=http://www.redhat.com/docs/manuals/satellite/ -docs.install_guide=http://www.redhat.com/docs/manuals/satellite/ -docs.proxy_guide=http://www.redhat.com/docs/manuals/satellite/ -docs.client_config_guide=http://www.redhat.com/docs/manuals/satellite/ -docs.user_guide=http://www.redhat.com/docs/manuals/satellite/ -docs.getting_started_guide=http://www.redhat.com/docs/manuals/satellite/ +docs.reference_guide=https://access.redhat.com/site/documentation/en-US/Red_Hat_Satellite/5.6/ +docs.install_guide=https://access.redhat.com/site/documentation/en-US/Red_Hat_Satellite/5.6/ +docs.proxy_guide=https://access.redhat.com/site/documentation/en-US/Red_Hat_Satellite/5.6/ +docs.client_config_guide=https://access.redhat.com/site/documentation/en-US/Red_Hat_Satellite/5.6/ +docs.user_guide=https://access.redhat.com/site/documentation/en-US/Red_Hat_Satellite/5.6/ +docs.getting_started_guide=https://access.redhat.com/site/documentation/en-US/Red_Hat_Satellite/5.6/ docs.release_notes=https://fedorahosted.org/spacewalk/wiki/ReleaseNotes commit 12b58d02ec29a47821cc3db9ec52a32c31239c7e Author: Tomas Lestach <tlestach(a)redhat.com> Date: Tue Sep 24 16:48:37 2013 +0200 replace 'Channel Managemet Guide' docs with 'User Guide' and 'Getting Started Guide' diff --git a/branding/conf/rhn_docs.conf b/branding/conf/rhn_docs.conf index 42878fc..9840cab 100644 --- a/branding/conf/rhn_docs.conf +++ b/branding/conf/rhn_docs.conf @@ -2,5 +2,6 @@ docs.reference_guide=http://www.redhat.com/docs/manuals/satellite/ docs.install_guide=http://www.redhat.com/docs/manuals/satellite/ docs.proxy_guide=http://www.redhat.com/docs/manuals/satellite/ docs.client_config_guide=http://www.redhat.com/docs/manuals/satellite/ -docs.channel_mgmt_guide=http://www.redhat.com/docs/manuals/satellite/ +docs.user_guide=http://www.redhat.com/docs/manuals/satellite/ +docs.getting_started_guide=http://www.redhat.com/docs/manuals/satellite/ docs.release_notes=https://fedorahosted.org/spacewalk/wiki/ReleaseNotes diff --git a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java index 46a1b34..5cd5579 100644 --- a/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java +++ b/java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java @@ -91,7 +91,8 @@ public class ConfigDefaults { public static final String DOC_INSTALL_GUIDE = "docs.install_guide"; public static final String DOC_PROXY_GUIDE = "docs.proxy_guide"; public static final String DOC_CLIENT_CONFIG_GUIDE = "docs.client_config_guide"; - public static final String DOC_CHANNEL_MGMT_GUIDE = "docs.channel_mgmt_guide"; + public static final String DOC_USER_GUIDE = "docs.user_guide"; + public static final String DOC_GETTING_STARTED_GUIDE = "docs.getting_started_guide"; public static final String DOC_RELEASE_NOTES = "docs.release_notes"; public static final String WEB_SUBSCRIBE_PROXY_CHANNEL = "web.subscribe_proxy_channel"; diff --git a/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java b/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java index a1e2b05..49efdfb 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/help/HelpAction.java @@ -64,9 +64,14 @@ public class HelpAction extends RhnAction { request.setAttribute("client_config_guide", doc); } - doc = Config.get().getString(ConfigDefaults.DOC_CHANNEL_MGMT_GUIDE); + doc = Config.get().getString(ConfigDefaults.DOC_USER_GUIDE); if (doc != null && doc.trim().length() > 0) { - request.setAttribute("channel_mgmt_guide", doc); + request.setAttribute("user_guide", doc); + } + + doc = Config.get().getString(ConfigDefaults.DOC_GETTING_STARTED_GUIDE); + if (doc != null && doc.trim().length() > 0) { + request.setAttribute("getting_started_guide", doc); } doc = Config.get().getString(ConfigDefaults.DOC_RELEASE_NOTES); 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 0810688..c519126 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 @@ -410,6 +410,18 @@ <context context-type="sourcefile">Navigation Menu</context> </context-group> </trans-unit> + <trans-unit id="User Guide"> + <source>User Guide</source> + <context-group name="ctx"> + <context context-type="sourcefile">Navigation Menu</context> + </context-group> + </trans-unit> + <trans-unit id="Getting Started Guide"> + <source>Getting Started Guide</source> + <context-group name="ctx"> + <context context-type="sourcefile">Navigation Menu</context> + </context-group> + </trans-unit> <trans-unit id="Clone Errata"> <source>Clone Errata</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 a53fcdf..4043404 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 @@ -18951,6 +18951,18 @@ given channel.</source> <trans-unit id="help.jsp.release.title"> <source>@@PRODUCT_NAME@@ Release Notes</source> </trans-unit> + <trans-unit id="help.jsp.user.title"> + <source>User Guide</source> + </trans-unit> + <trans-unit id="help.jsp.user"> + <source>Using and administering Red Hat Satellite</source> + </trans-unit> + <trans-unit id="help.jsp.start.title"> + <source>Getting Started Guide</source> + </trans-unit> + <trans-unit id="help.jsp.start"> + <source>Basic setup and configuration with Red Hat Satellite</source> + </trans-unit> <trans-unit id="iprange.emptylist"> <source>No Ip Ranges Found</source> </trans-unit> diff --git a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml index f5feeb0..7e4e51c 100644 --- a/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml +++ b/java/code/webapp/WEB-INF/nav/sitenav-authenticated.xml @@ -350,8 +350,11 @@ <rhn-tab name="Client Configuration" url="/rhn/help/dispatcher/client_config_guide"> <rhn-tab-directory>/rhn/help/client-config</rhn-tab-directory> </rhn-tab> - <rhn-tab name="Channel Management" url="/rhn/help/dispatcher/channel_mgmt_guide"> - <rhn-tab-directory>/rhn/help/channel-mgmt</rhn-tab-directory> + <rhn-tab name="User Guide" url="/rhn/help/dispatcher/user_guide"> + <rhn-tab-directory>/rhn/help/user-guide</rhn-tab-directory> + </rhn-tab> + <rhn-tab name="Getting Started Guide" url="/rhn/help/dispatcher/getting_started_guide"> + <rhn-tab-directory>/rhn/help/getting-started</rhn-tab-directory> </rhn-tab> <rhn-tab name="Release Notes" url="/rhn/help/dispatcher/release_notes"> <rhn-tab-directory>/rhn/help/release-notes/satellite</rhn-tab-directory> diff --git a/java/code/webapp/WEB-INF/nav/sitenav.xml b/java/code/webapp/WEB-INF/nav/sitenav.xml index 4504a21..086fb63 100644 --- a/java/code/webapp/WEB-INF/nav/sitenav.xml +++ b/java/code/webapp/WEB-INF/nav/sitenav.xml @@ -24,8 +24,11 @@ <rhn-tab name="Client Configuration" url="/rhn/help/dispatcher/client_config_guide"> <rhn-tab-directory>/rhn/help/client-config</rhn-tab-directory> </rhn-tab> - <rhn-tab name="Channel Management" url="/rhn/help/dispatcher/channel_mgmt_guide"> - <rhn-tab-directory>/rhn/help/channel-mgmt</rhn-tab-directory> + <rhn-tab name="User Guide" url="/rhn/help/dispatcher/user_guide"> + <rhn-tab-directory>/rhn/help/user-guide</rhn-tab-directory> + </rhn-tab> + <rhn-tab name="Getting Started Guide" url="/rhn/help/dispatcher/getting_started_guide"> + <rhn-tab-directory>/rhn/help/getting-started</rhn-tab-directory> </rhn-tab> <rhn-tab name="API" url="/rhn/apidoc/index.jsp"> <rhn-tab name="Overview" url="/rhn/apidoc/index.jsp"> diff --git a/java/code/webapp/WEB-INF/pages/help/helpindex.jsp b/java/code/webapp/WEB-INF/pages/help/helpindex.jsp index ba50f83..e7a3b51 100644 --- a/java/code/webapp/WEB-INF/pages/help/helpindex.jsp +++ b/java/code/webapp/WEB-INF/pages/help/helpindex.jsp @@ -50,12 +50,19 @@ </li> <li> - <a style="font-size:12pt" href=/rhn/help/dispatcher/channel_mgmt_guide> - <bean:message key="help.jsp.channel.title"/> + <a style="font-size:12pt" href=/rhn/help/dispatcher/user_guide> + <bean:message key="help.jsp.user.title"/> + </a> + <br /> + <bean:message key="help.jsp.user"/> + </li> + + <li> + <a style="font-size:12pt" href=/rhn/help/dispatcher/getting_started_guide> + <bean:message key="help.jsp.start.title"/> </a> - <strong><bean:message key="help.jsp.translation"/></strong> <br /> - <bean:message key="help.jsp.channel"/> + <bean:message key="help.jsp.start"/> </li> <li> diff --git a/web/include/nav/sitenav-authenticated.xml b/web/include/nav/sitenav-authenticated.xml index e486305..d0e973d 100644 --- a/web/include/nav/sitenav-authenticated.xml +++ b/web/include/nav/sitenav-authenticated.xml @@ -272,8 +272,11 @@ <rhn-tab name="Client Configuration" url="https://www.redhat.com/docs/manuals/satellite"> <rhn-tab-directory>/rhn/help/client-config/</rhn-tab-directory> </rhn-tab> - <rhn-tab name="Channel Management" url="https://www.redhat.com/docs/manuals/satellite" > - <rhn-tab-directory>/rhn/help/channel-mgmt/</rhn-tab-directory> + <rhn-tab name="User Guide" url="/rhn/help/dispatcher/user_guide"> + <rhn-tab-directory>/rhn/help/user-guide</rhn-tab-directory> + </rhn-tab> + <rhn-tab name="Getting Started Guide" url="/rhn/help/dispatcher/getting_started_guide"> + <rhn-tab-directory>/rhn/help/getting-started</rhn-tab-directory> </rhn-tab> <rhn-tab name="Release Notes" url="https://www.redhat.com/docs/manuals/satellite" > <rhn-tab-directory>/rhn/help/release-notes/satellite/</rhn-tab-directory> diff --git a/web/include/nav/sitenav.xml b/web/include/nav/sitenav.xml index 8f8cf41..d61910a 100644 --- a/web/include/nav/sitenav.xml +++ b/web/include/nav/sitenav.xml @@ -24,8 +24,11 @@ <rhn-tab name="Client Configuration" url="/rhn/help/dispatcher/client_config_guide"> <rhn-tab-directory>/rhn/help/client-config</rhn-tab-directory> </rhn-tab> - <rhn-tab name="Channel Management" url="/rhn/help/dispatcher/channel_mgmt_guide"> - <rhn-tab-directory>/rhn/help/channel-mgmt</rhn-tab-directory> + <rhn-tab name="User Guide" url="/rhn/help/dispatcher/user_guide"> + <rhn-tab-directory>/rhn/help/user-guide</rhn-tab-directory> + </rhn-tab> + <rhn-tab name="Getting Started Guide" url="/rhn/help/dispatcher/getting_started"> + <rhn-tab-directory>/rhn/help/getting-started</rhn-tab-directory> </rhn-tab> <rhn-tab name="API" url="/rhn/apidoc/index.jsp"> <rhn-tab name="Overview" url="/rhn/apidoc/index.jsp">

1 0

Changes to 'refs/tags/spacewalk-backend-2.1.35-1'
by Milan Zazrivec 15 Nov '13

15 Nov '13

Tag 'spacewalk-backend-2.1.35-1' created by Milan Zazrivec <mzazrivec(a)redhat.com> at 2013-11-15 16:14 +0000 Tagging package [spacewalk-backend] version [2.1.35-1] in directory [backend/]. Changes since spacewalk-search-2.1.6-1: Milan Zazrivec (2): 991044 - change python module permissions to rw-r--r-- Automatic commit of package [spacewalk-backend] release [2.1.35-1]. --- backend/Makefile.defs | 2 +- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

2 commits - backend/Makefile.defs backend/spacewalk-backend.spec rel-eng/packages
by Milan Zazrivec 15 Nov '13

15 Nov '13

backend/Makefile.defs | 2 +- backend/spacewalk-backend.spec | 5 ++++- rel-eng/packages/spacewalk-backend | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) New commits: commit d72b6596fd6fb8889393a7706c669841a5a94b33 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Nov 15 17:14:50 2013 +0100 Automatic commit of package [spacewalk-backend] release [2.1.35-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 2979b14..e5ec4e3 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -11,7 +11,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 -Version: 2.1.34 +Version: 2.1.35 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -628,6 +628,9 @@ rm -f %{rhnconf}/rhnSecret.py* %{pythonrhnroot}/satellite_tools/exporter/xmlWriter.py* %changelog +* Fri Nov 15 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 2.1.35-1 +- 991044 - change python module permissions to rw-r--r-- + * Thu Oct 31 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.34-1 - 1020952 - Single db root cert + option name change diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 1d01668..5518c1f 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -2.1.34-1 backend/ +2.1.35-1 backend/ commit 6c4f4b0727710393f6aaf1636b26d6218ca07bc3 Author: Milan Zazrivec <mzazrivec(a)redhat.com> Date: Fri Nov 15 17:09:32 2013 +0100 991044 - change python module permissions to rw-r--r-- diff --git a/backend/Makefile.defs b/backend/Makefile.defs index 7de3248..b5074fa 100644 --- a/backend/Makefile.defs +++ b/backend/Makefile.defs @@ -23,7 +23,7 @@ SOFLAGS = -shared -fPIC # Installation stuff INSTALL = /usr/bin/install -c --verbose INSTALL_BIN = $(INSTALL) -m 755 -INSTALL_DATA = $(INSTALL) -m 664 +INSTALL_DATA = $(INSTALL) -m 644 INSTALL_DIR = $(INSTALL) -m 755 -d # This is for the subdir part

1 0

Changes to 'refs/tags/spacewalk-search-2.1.6-1'
by Tomas Lestach 15 Nov '13

15 Nov '13

Tag 'spacewalk-search-2.1.6-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-11-15 15:26 +0000 Tagging package [spacewalk-search] version [2.1.6-1] in directory [search-server/spacewalk-search/]. Changes since spacewalk-java-2.1.75-1: Johannes Renner (1): Fix custom info value index removal in advanced search Tomas Lestach (1): Automatic commit of package [spacewalk-search] release [2.1.6-1]. --- rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/ServerCustomInfo.java | 10 +++++----- search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java | 6 +++--- 4 files changed, 13 insertions(+), 10 deletions(-) ---

1 0

2 commits - rel-eng/packages search-server/spacewalk-search
by Tomas Lestach 15 Nov '13

15 Nov '13

rel-eng/packages/spacewalk-search | 2 +- search-server/spacewalk-search/spacewalk-search.spec | 5 ++++- search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/ServerCustomInfo.java | 10 +++++----- search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java | 6 +++--- 4 files changed, 13 insertions(+), 10 deletions(-) New commits: commit c0b985b3df36573d374bf2de5f143ebf526a26b4 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Fri Nov 15 16:26:10 2013 +0100 Automatic commit of package [spacewalk-search] release [2.1.6-1]. diff --git a/rel-eng/packages/spacewalk-search b/rel-eng/packages/spacewalk-search index 048e9c3..57e73af 100644 --- a/rel-eng/packages/spacewalk-search +++ b/rel-eng/packages/spacewalk-search @@ -1 +1 @@ -2.1.5-1 search-server/spacewalk-search/ +2.1.6-1 search-server/spacewalk-search/ diff --git a/search-server/spacewalk-search/spacewalk-search.spec b/search-server/spacewalk-search/spacewalk-search.spec index 82a499a..ad9e0a3 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: 2.1.5 +Version: 2.1.6 Release: 1%{?dist} # This src.rpm is cannonical upstream # You can obtain it using this set of commands @@ -182,6 +182,9 @@ fi %attr(755, root, root) %{_var}/lib/rhn/search/indexes/docs %changelog +* Fri Nov 15 2013 Tomas Lestach <tlestach(a)redhat.com> 2.1.6-1 +- Fix custom info value index removal in advanced search + * Thu Oct 31 2013 Matej Kollar <mkollar(a)redhat.com> 2.1.5-1 - 1020952 - Single db root cert + option name change commit 063c0a9838a6b306bf4ff18b9db24022300dc433 Author: Johannes Renner <jrenner(a)suse.de> Date: Tue Nov 12 16:26:31 2013 +0100 Fix custom info value index removal in advanced search diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/ServerCustomInfo.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/ServerCustomInfo.java index 8626289..3b0b53f 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/ServerCustomInfo.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/db/models/ServerCustomInfo.java @@ -33,17 +33,17 @@ public class ServerCustomInfo extends GenericRecord { * * @param serverIdIn server id * @param keyIdIn key id - * @return string based on server id and key id + * @return long based on server id and key id */ - public static String makeUniqId(long serverIdIn, long keyIdIn) { - return serverIdIn + "-" + keyIdIn; + public static long makeUniqId(long serverIdIn, long keyIdIn) { + return new Long("" + serverIdIn + keyIdIn); } /** * - * @return uniqId + * @return unique id for a server/custom info key pair */ - public String getUniqId() { + public long getId() { return makeUniqId(serverId, keyId); } /** diff --git a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java index 32d7af8..a755a06 100644 --- a/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java +++ b/search-server/spacewalk-search/src/java/com/redhat/satellite/search/scheduler/tasks/IndexServerCustomInfoTask.java @@ -62,7 +62,7 @@ public class IndexServerCustomInfoTask extends GenericIndexTask { } idSet = new HashSet<String>(); for (ServerCustomInfo scInfo : ids) { - idSet.add(scInfo.getUniqId()); + idSet.add(new Long(scInfo.getId()).toString()); } uniqField = getUniqueFieldId(); indexName = getIndexName(); @@ -93,7 +93,7 @@ public class IndexServerCustomInfoTask extends GenericIndexTask { throws ClassCastException { ServerCustomInfo scInfo = (ServerCustomInfo)data; Map<String, String> attrs = new HashMap<String, String>(); - attrs.put("uniqId", scInfo.getUniqId()); + attrs.put("id", new Long(scInfo.getId()).toString()); attrs.put("serverId", new Long(scInfo.getServerId()).toString()); attrs.put("value", scInfo.getValue()); attrs.put("label", scInfo.getLabel()); @@ -156,7 +156,7 @@ public class IndexServerCustomInfoTask extends GenericIndexTask { * {@inheritDoc} */ public String getUniqueFieldId() { - return "uniqId"; + return "id"; } /** * {@inheritDoc}

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
21
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits November 2013