Changes to 'refs/tags/perl-NOCpulse-Probe-1.184.8-1'
by Jan Pazdziora
Tag 'perl-NOCpulse-Probe-1.184.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-05-16 11:25 +0000
Tagging package [perl-NOCpulse-Probe] version [1.184.8-1] in directory [monitoring/PerlModules/NP/Probe/].
Changes since spacewalk-java-1.5.29-1:
Jan Pazdziora (2):
The database handle now has AutoCommit turned off, so begin_work is not needed anymore.
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.8-1].
---
monitoring/PerlModules/NP/Probe/monitoring-data-cleanup | 3 ---
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 6 +++++-
rel-eng/packages/perl-NOCpulse-Probe | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)
---
12 years, 11 months
monitoring/PerlModules rel-eng/packages
by Jan Pazdziora
monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec | 6 +++++-
rel-eng/packages/perl-NOCpulse-Probe | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 3b037b80f342f6b84b0a220ce047c622db389cd0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 13:25:03 2011 +0200
Automatic commit of package [perl-NOCpulse-Probe] release [1.184.8-1].
diff --git a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
index 7d1ac06..53ec441 100644
--- a/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
+++ b/monitoring/PerlModules/NP/Probe/perl-NOCpulse-Probe.spec
@@ -2,7 +2,7 @@ Name: perl-NOCpulse-Probe
Summary: Monitoring probes for Spacewalk
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.184.7
+Version: 1.184.8
Release: 1%{?dist}
BuildArch: noarch
Group: Development/Libraries
@@ -146,6 +146,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/NOCpulse::Probe::Shell::SQLPlus*
%changelog
+* Mon May 16 2011 Jan Pazdziora 1.184.8-1
+- The database handle now has AutoCommit turned off, so begin_work is not
+ needed anymore.
+
* Fri Mar 18 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.184.7-1
- fixed db connection in monitoring-data-cleanup (PG)
diff --git a/rel-eng/packages/perl-NOCpulse-Probe b/rel-eng/packages/perl-NOCpulse-Probe
index 950e909..b6373b1 100644
--- a/rel-eng/packages/perl-NOCpulse-Probe
+++ b/rel-eng/packages/perl-NOCpulse-Probe
@@ -1 +1 @@
-1.184.7-1 monitoring/PerlModules/NP/Probe/
+1.184.8-1 monitoring/PerlModules/NP/Probe/
12 years, 11 months
monitoring/PerlModules
by Jan Pazdziora
monitoring/PerlModules/NP/Probe/monitoring-data-cleanup | 3 ---
1 file changed, 3 deletions(-)
New commits:
commit bca82f24fb97aa18c456954bad14e3efe98f55ea
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon May 16 13:23:39 2011 +0200
The database handle now has AutoCommit turned off, so begin_work is not needed anymore.
Addressing
Deleting probes data older than 10:50:35 Apr 16, 2011...
RHN::Exception: DBD::Oracle::db begin_work failed: Already in a transaction
RHN::DB /usr/lib/perl5/vendor_perl/5.8.8/RHN/DB.pm 228 RHN::Exception::DB::throw
main /usr/bin/monitoring-data-cleanup 128 RHN::DB::handle_error
diff --git a/monitoring/PerlModules/NP/Probe/monitoring-data-cleanup b/monitoring/PerlModules/NP/Probe/monitoring-data-cleanup
index 1ee6e07..76bf296 100755
--- a/monitoring/PerlModules/NP/Probe/monitoring-data-cleanup
+++ b/monitoring/PerlModules/NP/Probe/monitoring-data-cleanup
@@ -58,7 +58,6 @@ if (%$localConfig) {
}
if ($delete_unmatched) {
- $ini->dbh->begin_work;
print "Deleting data from already deleted probes...\n";
$sql = qq|
delete from time_series
@@ -110,7 +109,6 @@ if ($interval && $delta) {
foreach my $delete_date (@date_list) {
print UnixDate($delete_date,"Deleting probes data older than %T %b %e, %Y...\n");
- $ini->dbh->begin_work;
$sth->execute(UnixDate($delete_date,"%s"));
print "\t", $sth->rows, " record deleted.\n";
$dry_run ? $ini->dbh->rollback : $ini->dbh->commit;
@@ -125,7 +123,6 @@ if ($interval && $delta) {
}
print UnixDate($date,"Deleting probes data older than %T %b %e, %Y...\n");
$sql = qq|delete from time_series where entry_time < ?|;
- $ini->dbh->begin_work;
$sth = $ini->dbh->prepare($sql);
$sth->execute(UnixDate($date,"%s"));
print "\t", $sth->rows, " record deleted.\n";
12 years, 11 months
Changes to 'refs/tags/spacewalk-java-1.5.29-1'
by Michael Mraka
Tag 'spacewalk-java-1.5.29-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-05-16 08:14 +0000
Tagging package [spacewalk-java] version [1.5.29-1] in directory [java/].
Changes since spacewalk-backend-1.5.21-1:
Julian Einwag (1):
fixed SQL typo
Michael Mraka (2):
704446 - removed unnecessary cast to string
Automatic commit of package [spacewalk-java] release [1.5.29-1].
Miroslav Suchý (14):
cleanup - old certificate, not used anymore
clean up - Opt Out page is not present since sat420
cleanup - CVE functionality has been already migrated to java
documentation does not need log in
cleanup - make_vile is not used any more
cleanup - in /html/index.html is no pxt code, just pure html
cleanup - this dir is empty, nothing to protect here
cleanup - this dir is empty, nothing to protect here
cleanup - this dir is empty, nothing to protect here
cleanup - this dir is empty, nothing to protect here
cleanup - file channel_*_perms.pxt does not exist any more
cleanup - page entitlements.pxt does not exist any more
cleanup - page target_system_list.pxt does not exist any more under network/systems/groups
cleanup - page system_list.pxt does not exist any more under network/systems/groups
---
java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml | 2
java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java | 4
java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java | 4
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
web/html/.htaccess | 17
web/html/help/.htaccess | 43 --
web/html/help/RHNS-CA-CERT | 204 ----------
web/html/help/RHNS-CA-CERT.asc | 7
web/html/network/entitlement/.htaccess | 7
web/html/network/errata/manage/clone/.htaccess | 9
web/html/network/monitoring/config/.htaccess | 8
web/html/network/profiles/.htaccess | 8
web/html/network/systems/.htaccess | 10
web/html/network/systems/groups/.htaccess | 21 -
web/html/network/users/details/.htaccess | 11
web/modules/pxt/PXT/ApacheHandler.pm | 14
web/modules/pxt/PXT/Request.pm | 1
web/modules/rhn/RHN/I18N.pm | 1
19 files changed, 11 insertions(+), 368 deletions(-)
---
12 years, 11 months
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit df1226f7316ac40886660bebc2c09a2ae040138f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 16 10:14:47 2011 +0200
Automatic commit of package [spacewalk-java] release [1.5.29-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 45b71a2..07474f2 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.5.28
+Version: 1.5.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -540,6 +540,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon May 16 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.5.29-1
+- 704446 - removed unnecessary cast to string
+- fixed SQL typo
+
* Fri May 13 2011 Jan Pazdziora 1.5.28-1
- introduce NoSuchConfigFilePathException for configchannel and server.config
APIs (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 2a2ab03..a0ee98f 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.5.28-1 java/
+1.5.29-1 java/
12 years, 11 months
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java | 4 ++--
java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit be6374188bebab573ba993c9d57f9258ad6043a2
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon May 16 10:06:43 2011 +0200
704446 - removed unnecessary cast to string
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
index e51c553..0ca196c 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLister.java
@@ -354,9 +354,9 @@ public class KickstartLister extends BaseManager {
* @param ksId kickstart profile
* @return DataResult list of timezones.
*/
- public DataResult getValidTimezones(String ksId) {
+ public DataResult getValidTimezones(Long ksId) {
if (logger.isDebugEnabled()) {
- logger.debug("getValidTimezones(ksId=" + ksId +
+ logger.debug("getValidTimezones(ksId=" + ksId.toString() +
") - start");
}
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java
index e7c7d7a..52a18ea 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartLocaleCommand.java
@@ -123,7 +123,7 @@ public class KickstartLocaleCommand extends BaseKickstartCommand {
*/
public ArrayList getValidTimezones() {
DataResult dr = KickstartLister.getInstance()
- .getValidTimezones(getKickstartData().getId().toString());
+ .getValidTimezones(getKickstartData().getId());
Iterator iter = dr.iterator();
ArrayList ret = new ArrayList();
@@ -149,7 +149,7 @@ public class KickstartLocaleCommand extends BaseKickstartCommand {
public Boolean isValidTimezone(String timezone) {
DataResult dr = KickstartLister.getInstance()
- .getValidTimezones(getKickstartData().getId().toString());
+ .getValidTimezones(getKickstartData().getId());
Iterator iter = dr.iterator();
while (iter.hasNext()) {
12 years, 11 months
4 commits - web/html
by Miroslav Suchý
web/html/network/systems/.htaccess | 10 ----------
web/html/network/systems/groups/.htaccess | 21 ---------------------
web/html/network/users/details/.htaccess | 11 -----------
3 files changed, 42 deletions(-)
New commits:
commit 5db6987953ea206b4645bc7e8ff1d35df7b02d91
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 10:06:07 2011 +0200
cleanup - page system_list.pxt does not exist any more under network/systems/groups
diff --git a/web/html/network/systems/groups/.htaccess b/web/html/network/systems/groups/.htaccess
index 972a356..8addf72 100644
--- a/web/html/network/systems/groups/.htaccess
+++ b/web/html/network/systems/groups/.htaccess
@@ -60,16 +60,6 @@ require acl org_entitlement(sw_mgr_enterprise)
require acl user_has_access_to_servergroup()
</Files>
-<Files system_list.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_has_access_to_servergroup()
-</Files>
-
<Files errata_list.pxt>
AuthType Basic
AuthName "RHN System Group Admin Area"
commit e83c70395f232e388adeb9c915f8d0a02ae51569
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 10:05:04 2011 +0200
cleanup - page target_system_list.pxt does not exist any more under network/systems/groups
diff --git a/web/html/network/systems/groups/.htaccess b/web/html/network/systems/groups/.htaccess
index 1a4741d..972a356 100644
--- a/web/html/network/systems/groups/.htaccess
+++ b/web/html/network/systems/groups/.htaccess
@@ -49,17 +49,6 @@ require acl org_entitlement(sw_mgr_enterprise)
require acl user_has_access_to_servergroup()
</Files>
-<Files target_system_list.pxt>
- AuthType Basic
- AuthName "RHN System Group Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(system_group_admin)
- require acl user_has_access_to_servergroup()
-</Files>
-
<Files edit_properties.pxt>
AuthType Basic
AuthName "RHN System Group Admin Area"
commit 10936b44a55fd0b9ae0b6692f563d40ccd9bd564
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 10:02:16 2011 +0200
cleanup - page entitlements.pxt does not exist any more
diff --git a/web/html/network/systems/.htaccess b/web/html/network/systems/.htaccess
index e57bedf..ebeb0af 100644
--- a/web/html/network/systems/.htaccess
+++ b/web/html/network/systems/.htaccess
@@ -4,13 +4,3 @@
PerlModule PXT::ApacheHandler
PerlHandler PXT::ApacheHandler
</Files>
-
-<Files entitlements.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(org_admin)
-</Files>
commit beab3e674c486b8dd577c307cddb07bcfa697d27
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 10:01:27 2011 +0200
cleanup - file channel_*_perms.pxt does not exist any more
diff --git a/web/html/network/users/details/.htaccess b/web/html/network/users/details/.htaccess
index 458e78c..094e49d 100644
--- a/web/html/network/users/details/.htaccess
+++ b/web/html/network/users/details/.htaccess
@@ -7,14 +7,3 @@
PerlAuthenHandler PXT::ApacheAuth
require acl user_role(org_admin)
</Files>
-
-<Files channel_*_perms.pxt>
- AuthType Basic
- AuthName "RHN Org Admin Area"
-
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
- require acl user_role(channel_admin)
-</Files>
-
12 years, 11 months
4 commits - web/html
by Miroslav Suchý
web/html/network/entitlement/.htaccess | 7 -------
web/html/network/errata/manage/clone/.htaccess | 9 ---------
web/html/network/monitoring/config/.htaccess | 8 --------
web/html/network/profiles/.htaccess | 8 --------
4 files changed, 32 deletions(-)
New commits:
commit 341eed9833febdb9a96458fe436516055a61e7c5
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:57:15 2011 +0200
cleanup - this dir is empty, nothing to protect here
diff --git a/web/html/network/entitlement/.htaccess b/web/html/network/entitlement/.htaccess
deleted file mode 100644
index 0baffef..0000000
--- a/web/html/network/entitlement/.htaccess
+++ /dev/null
@@ -1,7 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(org_admin)
commit 6c44f1dc4ad672ee10f049da303f3d7442ff76b9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:56:08 2011 +0200
cleanup - this dir is empty, nothing to protect here
diff --git a/web/html/network/errata/manage/clone/.htaccess b/web/html/network/errata/manage/clone/.htaccess
deleted file mode 100644
index 304f6f5..0000000
--- a/web/html/network/errata/manage/clone/.htaccess
+++ /dev/null
@@ -1,9 +0,0 @@
-AuthType Basic
-AuthName "RHN Channel Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(channel_admin)
-
-PerlSetVar errata_context manage
commit 3fa0ee32bb1f451466ffc5c302b21c9029beb802
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:55:37 2011 +0200
cleanup - this dir is empty, nothing to protect here
diff --git a/web/html/network/profiles/.htaccess b/web/html/network/profiles/.htaccess
deleted file mode 100644
index 73aae80..0000000
--- a/web/html/network/profiles/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Org Admin Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-
-require acl org_entitlement(sw_mgr_enterprise)
commit 1fa8c14d0f503e698a9b2a7ce0ccc9ab58781c29
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:53:52 2011 +0200
cleanup - this dir is empty, nothing to protect here
diff --git a/web/html/network/monitoring/config/.htaccess b/web/html/network/monitoring/config/.htaccess
deleted file mode 100644
index 5da75a8..0000000
--- a/web/html/network/monitoring/config/.htaccess
+++ /dev/null
@@ -1,8 +0,0 @@
-AuthType Basic
-AuthName "RHN Monitoring Area"
-
-PerlModule PXT::ApacheHandler
-PerlModule PXT::ApacheAuth
-PerlAuthenHandler PXT::ApacheAuth
-require acl user_role(monitoring_admin)
-
12 years, 11 months
3 commits - web/html web/modules
by Miroslav Suchý
web/html/help/.htaccess | 43 -----------------------------------
web/modules/pxt/PXT/ApacheHandler.pm | 14 -----------
web/modules/pxt/PXT/Request.pm | 1
web/modules/rhn/RHN/I18N.pm | 1
4 files changed, 59 deletions(-)
New commits:
commit 42234ad1fb3d1cde69689cdb9f1efa9d51cf3c30
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:45:22 2011 +0200
cleanup - in /html/index.html is no pxt code, just pure html
diff --git a/web/html/help/.htaccess b/web/html/help/.htaccess
deleted file mode 100644
index 0845de9..0000000
--- a/web/html/help/.htaccess
+++ /dev/null
@@ -1,6 +0,0 @@
-<Files *.html>
- ForceType text/pxt
- SetHandler perl-script
- PerlModule PXT::ApacheHandler
- PerlHandler PXT::ApacheHandler
-</Files>
commit fec4c2b13e420505b09200d39ef6bb5bba6f4a72
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:44:07 2011 +0200
cleanup - make_vile is not used any more
diff --git a/web/html/help/.htaccess b/web/html/help/.htaccess
index cbc3944..0845de9 100644
--- a/web/html/help/.htaccess
+++ b/web/html/help/.htaccess
@@ -4,6 +4,3 @@
PerlModule PXT::ApacheHandler
PerlHandler PXT::ApacheHandler
</Files>
-
-PerlSetVar pxt_make_vile off
-
diff --git a/web/modules/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm
index 949a240..4cb66c3 100644
--- a/web/modules/pxt/PXT/ApacheHandler.pm
+++ b/web/modules/pxt/PXT/ApacheHandler.pm
@@ -46,13 +46,9 @@ use RHN::Mail;
use PXT::Debug ();
use RHN::DB ();
-our $make_vile;
-
sub handler {
my $r = shift;
-
- local $make_vile = 0;
$ENV{PATH} = "/bin:/usr/sbin";
return DECLINED unless
@@ -170,16 +166,6 @@ sub handler {
$file_contents = RHN::I18N->translate($file_contents);
}
- if ($file_contents =~ '<((rhn|pxt)-.*?)>') {
- warn "tag $1 seems to be unhandled?";
- $make_vile = "green";
- }
-
- if ($r->dir_config("pxt_make_vile") and $r->dir_config("pxt_make_vile") eq 'on' and $make_vile) {
- $file_contents =~ s/<body>/<body bgcolor="$make_vile">/;
- $file_contents =~ s(<link[^>]*>)()g;
- }
-
# Turn on byte pragma to get correct content length, and then turn it back off.
use bytes;
$r->headers_out->{'Content-Length'} = length $file_contents;
diff --git a/web/modules/pxt/PXT/Request.pm b/web/modules/pxt/PXT/Request.pm
index a61f091..55d8ab2 100644
--- a/web/modules/pxt/PXT/Request.pm
+++ b/web/modules/pxt/PXT/Request.pm
@@ -308,7 +308,6 @@ sub param {
}
else {
warn "Access to formvar '$var' not allowed: formvar not cleansed - ", join(", ", caller);
- $PXT::ApacheHandler::make_vile = "#ffff00";
}
}
diff --git a/web/modules/rhn/RHN/I18N.pm b/web/modules/rhn/RHN/I18N.pm
index 74124f6..3708e95 100644
--- a/web/modules/rhn/RHN/I18N.pm
+++ b/web/modules/rhn/RHN/I18N.pm
@@ -40,7 +40,6 @@ sub translate {
if (not $doc) {
warn "I18N XML Parsing failed: $@";
- $PXT::ApacheHandler::make_vile = "#ff98d6";
return $input;
}
commit 5f4472137214076b63bf17d82855fa95fd357b2e
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 16 09:24:21 2011 +0200
documentation does not need log in
and this names are old/not used anymore anyway
diff --git a/web/html/help/.htaccess b/web/html/help/.htaccess
index a52732d..cbc3944 100644
--- a/web/html/help/.htaccess
+++ b/web/html/help/.htaccess
@@ -1,37 +1,3 @@
-<Files RHN-channel-mgmt-en.pdf>
- AuthType Basic
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
-</Files>
-
-<Files RHN-proxy-en.pdf>
- AuthType Basic
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
-</Files>
-
-
-<Files RHN-satellite-en.pdf>
- AuthType Basic
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
-</Files>
-
-<Files RHN-client-config-en.pdf>
- AuthType Basic
- PerlModule PXT::ApacheHandler
- PerlModule PXT::ApacheAuth
- PerlAuthenHandler PXT::ApacheAuth
-
-</Files>
-
-
<Files *.html>
ForceType text/pxt
SetHandler perl-script
12 years, 11 months
java/code
by Michael Mraka
java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 1032f3b62a976446776da2223692cc750d6b0755
Author: Julian Einwag <je(a)rockenstein.de>
Date: Mon May 16 09:37:17 2011 +0200
fixed SQL typo
diff --git a/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml b/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml
index 534149b..3895fca 100644
--- a/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/org/Org.hbm.xml
@@ -76,7 +76,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
<sql-query name="Org.accessibleChannels">
<![CDATA[SELECT {c.*}
- FROM rhnChannel {c},
+ FROM rhnChannel {c}
LEFT JOIN rhnChannelCloned c_1_
ON c.id = c_1_.original_id
JOIN rhnAvailableChannels cfp
12 years, 11 months