java/code
by Tomáš Kašpárek
java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 590ae4fa46b4429a71d623a423cdb05f9bab2090
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 26 08:49:55 2013 +0200
912931 - move taskomatic bunch logs to /var/log instead of /var/lib
diff --git a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java
index a7d1753..8ba2e5b 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/TaskoRun.java
@@ -37,7 +37,7 @@ public class TaskoRun {
public static final String STATUS_FINISHED = "FINISHED";
public static final String STATUS_FAILED = "FAILED";
public static final String STATUS_SKIPPED = "SKIPPED";
- private static final String STD_LOG_PREFIX = "/var/lib/rhn/tasko/";
+ private static final String STD_LOG_PREFIX = "/var/log/rhn/tasko/";
private Long id;
private Integer orgId;
10 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.10.106-1'
by Grant Gainey
Tag 'spacewalk-java-1.10.106-1' created by Grant Gainey <ggainey(a)redhat.com> at 2013-06-25 22:33 +0000
Tagging package [spacewalk-java] version [1.10.106-1] in directory [java/].
Changes since spacewalk-backend-1.10.51-1:
Grant Gainey (2):
Fix checkstyle issues
Automatic commit of package [spacewalk-java] release [1.10.106-1].
---
java/code/src/com/redhat/rhn/domain/iss/IssMaster.java | 2 -
java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java | 2 -
java/code/src/com/redhat/rhn/domain/iss/IssSlave.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java | 4 --
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java | 4 --
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java | 4 --
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java | 4 --
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java | 15 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java | 2 -
java/spacewalk-java.spec | 5 ++-
rel-eng/packages/spacewalk-java | 2 -
20 files changed, 25 insertions(+), 39 deletions(-)
---
10 years, 10 months
java/spacewalk-java.spec rel-eng/packages
by Grant Gainey
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 0d3a9ad316753f7e521ed7c7ea7281d1e3de904f
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Jun 25 18:33:22 2013 -0400
Automatic commit of package [spacewalk-java] release [1.10.106-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f18f2ff..e7ac0b9 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: 1.10.105
+Version: 1.10.106
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Jun 25 2013 Grant Gainey 1.10.106-1
+- Fix checkstyle issues
+
* Tue Jun 25 2013 Grant Gainey 1.10.105-1
Feature: Support channel-permissions on ISS
- ISS: Fix inappropriate cascade when deleting a Slave
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 72ab8b4..dc7fd08 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.105-1 java/
+1.10.106-1 java/
10 years, 10 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/domain/iss/IssMaster.java | 2 -
java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java | 2 -
java/code/src/com/redhat/rhn/domain/iss/IssSlave.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java | 4 --
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java | 4 --
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java | 4 --
java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java | 4 --
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java | 15 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java | 2 -
18 files changed, 20 insertions(+), 37 deletions(-)
New commits:
commit fd711e2eb1cd158434fdeb8aa46acb8d4ee2f7f3
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Tue Jun 25 18:32:47 2013 -0400
Fix checkstyle issues
diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssMaster.java b/java/code/src/com/redhat/rhn/domain/iss/IssMaster.java
index 3978846..7eab4cd 100644
--- a/java/code/src/com/redhat/rhn/domain/iss/IssMaster.java
+++ b/java/code/src/com/redhat/rhn/domain/iss/IssMaster.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.domain.iss;
diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java b/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java
index b372bef..b9046af 100644
--- a/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java
+++ b/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.domain.iss;
diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssSlave.java b/java/code/src/com/redhat/rhn/domain/iss/IssSlave.java
index 43c5379..0131bbb 100644
--- a/java/code/src/com/redhat/rhn/domain/iss/IssSlave.java
+++ b/java/code/src/com/redhat/rhn/domain/iss/IssSlave.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.domain.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
index ba07512..198c574 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/AllowSlaveOrgsAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java
index f46e3c8..7cfcbfc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/DeleteSlaveAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java
index 8e784ae..6a1ad01 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java
index d1c2603..d5a5737 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/EditSlaveSetupAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
index e979414..365cf65 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/MapOrgsAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java
index f818a31..8cde808 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/MasterAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
index 45b8bb8..b297b25 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveMastersAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
index c089412..fa373a6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/RemoveSlavesAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java b/java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java
index 57b8659..f03826e 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/SlaveAction.java
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java
index ca3498b..c0377e7 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssEditSlaveActionTest.java
@@ -1,6 +1,5 @@
/**
- * Copyright (c) 2008--2012 Red Hat, Inc.
- * All Rights Reserved.
+ * Copyright (c) 2013 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss.test;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java
index 274b6ef..1a6a7ed 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMapOrgsActionTest.java
@@ -1,6 +1,5 @@
/**
- * Copyright (c) 2008--2012 Red Hat, Inc.
- * All Rights Reserved.
+ * Copyright (c) 2013 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss.test;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java
index a741a82..13c7b5b 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssMasterActionTest.java
@@ -1,6 +1,5 @@
/**
- * Copyright (c) 2008--2012 Red Hat, Inc.
- * All Rights Reserved.
+ * Copyright (c) 2013 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss.test;
diff --git a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java
index ffd3cdb..0034e53 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/iss/test/IssSlaveActionTest.java
@@ -1,6 +1,5 @@
/**
- * Copyright (c) 2008--2012 Red Hat, Inc.
- * All Rights Reserved.
+ * Copyright (c) 2013 Red Hat, Inc.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* Red Hat trademarks are not licensed under GPLv2. No permission is
* granted to use or replicate Red Hat trademarks that are incorporated
* in this software or its documentation.
- *
*/
package com.redhat.rhn.frontend.action.iss.test;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
index 1aa5c83..697ac50 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/test/IssMasterSerializerTest.java
@@ -1,3 +1,18 @@
+/**
+ * Copyright (c) 2013 Red Hat, Inc.
+ *
+ * This software is licensed to you under the GNU General Public License,
+ * version 2 (GPLv2). There is NO WARRANTY for this software, express or
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+
package com.redhat.rhn.frontend.xmlrpc.serializer.test;
import java.io.IOException;
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
index 31a197a..2b77372 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/sync/master/MasterHandler.java
@@ -248,7 +248,7 @@ public class MasterHandler extends BaseHandler {
* exported to this Slave
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param_desc("long", "id", "Id of the desired Master")
- * @xmlrpc.param #param("newOrg",
+ * @xmlrpc.param
* #struct("master-org details")
* #prop("int", "masterOrgId")
* #prop("string", "masterOrgName")
10 years, 10 months
Changes to 'refs/tags/spacewalk-backend-1.10.51-1'
by StephenHerr
Tag 'spacewalk-backend-1.10.51-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-06-25 14:53 +0000
Tagging package [spacewalk-backend] version [1.10.51-1] in directory [backend/].
Changes since spacewalk-certs-tools-1.10.6-1:
Stephen Herr (2):
977878 - fixing checkstyle errors
Automatic commit of package [spacewalk-backend] release [1.10.51-1].
---
backend/satellite_exporter/satexport.py | 8 ++++++--
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
---
10 years, 10 months
2 commits - backend/satellite_exporter backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr
backend/satellite_exporter/satexport.py | 8 ++++++--
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit b4ee42402a572f6ca4a62a08d1377f1c791ab469
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jun 25 10:53:47 2013 -0400
Automatic commit of package [spacewalk-backend] release [1.10.51-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 26053f9..5132abe 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.10.50
+Version: 1.10.51
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -639,6 +639,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jun 25 2013 Stephen Herr <sherr(a)redhat.com> 1.10.51-1
+- 977878 - fixing checkstyle errors
+
* Tue Jun 25 2013 Grant Gainey 1.10.50-1
- ISS: checking a couple of potentially None values
- ISS: make sure new satellites can sync to old ones
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a05284d..c17f862 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.50-1 backend/
+1.10.51-1 backend/
commit c85e241f94205cc48248c75af5bb23edf3b235a1
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue Jun 25 10:53:22 2013 -0400
977878 - fixing checkstyle errors
diff --git a/backend/satellite_exporter/satexport.py b/backend/satellite_exporter/satexport.py
index 4f01d69..553379b 100644
--- a/backend/satellite_exporter/satexport.py
+++ b/backend/satellite_exporter/satexport.py
@@ -209,8 +209,12 @@ class ApacheServer(BaseApacheServer):
raise rhnFault(2005, _('ISS is disabled on this satellite.'))
remote_hostname = req.get_remote_host(apache.REMOTE_DOUBLE_REV)
- row = rhnSQL.fetchone_dict("select id, allow_all_orgs from rhnISSSlave where slave = :hostname and enabled = 'Y'",
- hostname = idn_pune_to_unicode(remote_hostname))
+ row = rhnSQL.fetchone_dict("""
+ select id, allow_all_orgs
+ from rhnISSSlave
+ where slave = :hostname
+ and enabled = 'Y'
+ """, hostname = idn_pune_to_unicode(remote_hostname))
if not row:
raise rhnFault(2004,
_('Server "%s" is not enabled for ISS.')
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 91c862e..26053f9 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -422,6 +422,7 @@ rm -f %{rhnconf}/rhnSecret.py*
%{pythonrhnroot}/server/importlib/packageUpload.py*
%{pythonrhnroot}/server/importlib/productNamesImport.py*
%{pythonrhnroot}/server/importlib/userAuth.py*
+%{pythonrhnroot}/server/importlib/orgImport.py*
%{rhnroot}/server/handlers/__init__.py*
# Repomd stuff
10 years, 10 months
Changes to 'refs/tags/spacewalk-certs-tools-1.10.6-1'
by Tomáš Kašpárek
Tag 'spacewalk-certs-tools-1.10.6-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2013-06-25 14:12 +0000
Tagging package [spacewalk-certs-tools] version [1.10.6-1] in directory [spacewalk/certs-tools/].
Changes since spacewalk-schema-1.10.50-1:
Tomas Kasparek (2):
simplify product name logic
Automatic commit of package [spacewalk-certs-tools] release [1.10.6-1].
---
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/rhn_bootstrap.py | 18 +++++-------------
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
3 files changed, 10 insertions(+), 15 deletions(-)
---
10 years, 10 months
rel-eng/packages spacewalk/certs-tools
by Tomáš Kašpárek
rel-eng/packages/spacewalk-certs-tools | 2 +-
spacewalk/certs-tools/spacewalk-certs-tools.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8a27e1230745ccb460827d503a796580d39bc932
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 16:12:24 2013 +0200
Automatic commit of package [spacewalk-certs-tools] release [1.10.6-1].
diff --git a/rel-eng/packages/spacewalk-certs-tools b/rel-eng/packages/spacewalk-certs-tools
index 8dd4ff0..4338967 100644
--- a/rel-eng/packages/spacewalk-certs-tools
+++ b/rel-eng/packages/spacewalk-certs-tools
@@ -1 +1 @@
-1.10.5-1 spacewalk/certs-tools/
+1.10.6-1 spacewalk/certs-tools/
diff --git a/spacewalk/certs-tools/spacewalk-certs-tools.spec b/spacewalk/certs-tools/spacewalk-certs-tools.spec
index 3b7777b..5bdfa52 100644
--- a/spacewalk/certs-tools/spacewalk-certs-tools.spec
+++ b/spacewalk/certs-tools/spacewalk-certs-tools.spec
@@ -2,7 +2,7 @@ Name: spacewalk-certs-tools
Summary: Spacewalk SSL Key/Cert Tool
Group: Applications/Internet
License: GPLv2
-Version: 1.10.5
+Version: 1.10.6
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -57,6 +57,9 @@ rm -rf $RPM_BUILD_ROOT
%{_var}/www/html/pub/bootstrap/client_config_update.py*
%changelog
+* Tue Jun 25 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.6-1
+- simplify product name logic
+
* Tue Jun 25 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.5-1
- minor branding cleanup
10 years, 10 months
spacewalk/certs-tools
by Tomáš Kašpárek
spacewalk/certs-tools/rhn_bootstrap.py | 18 +++++-------------
1 file changed, 5 insertions(+), 13 deletions(-)
New commits:
commit 10f1e24ab3d3d8d7167648d441d4d78f7fbf87fe
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Tue Jun 25 16:11:33 2013 +0200
simplify product name logic
diff --git a/spacewalk/certs-tools/rhn_bootstrap.py b/spacewalk/certs-tools/rhn_bootstrap.py
index d518afe..457ba52 100644
--- a/spacewalk/certs-tools/rhn_bootstrap.py
+++ b/spacewalk/certs-tools/rhn_bootstrap.py
@@ -43,23 +43,15 @@ from rhn_bootstrap_strings import \
from sslToolConfig import CA_CRT_NAME, CA_CRT_RPM_NAME
from spacewalk.common.fileutils import rotateFile, cleanupAbsPath
from spacewalk.common.checksum import getFileChecksum
-from spacewalk.common.rhnConfig import CFG, initCFG
+from spacewalk.common.rhnConfig import PRODUCT_NAME
## GLOBALS
-initCFG('web')
-PRODUCT_NAME = CFG.PRODUCT_NAME
if os.path.exists('/usr/share/rhn/proxy') \
or os.path.exists('/var/www/rhns/proxy'):
- if PRODUCT_NAME == 'Spacewalk':
- PRODUCT_NAME = 'Spacewalk Proxy Server'
- else:
- PRODUCT_NAME = 'Red Hat Proxy Server'
+ MY_PRODUCT_NAME = PRODUCT_NAME + ' Server'
elif os.path.exists('/usr/share/rhn/server') \
or os.path.exists('/var/www/rhns/server'):
- if PRODUCT_NAME == 'Spacewalk':
- PRODUCT_NAME = 'Spacewalk Server'
- else:
- PRODUCT_NAME = 'Red Hat Satellite Server'
+ MY_PRODUCT_NAME = PRODUCT_NAME + ' Server'
DEFAULT_CA_CERT_PATH = '/usr/share/rhn/'+CA_CRT_NAME
@@ -572,7 +564,7 @@ def generateBootstrapScript(options):
# this means that we can negate those booleans with 1 - their current
# value (instead of doing not value which can yield True/False, which
# would print as such)
- newScript = getHeader(PRODUCT_NAME, options.activation_keys,
+ newScript = getHeader(MY_PRODUCT_NAME, options.activation_keys,
options.gpg_key, options.overrides, options.hostname,
orgCACert, isRpmYN, 1 - options.no_ssl, 1 - options.no_gpg,
options.allow_config_actions, options.allow_remote_commands,
@@ -585,7 +577,7 @@ def generateBootstrapScript(options):
newScript = newScript + getGPGKeyImportSh() + getCorpCACertSh() + \
- getRegistrationSh(PRODUCT_NAME)
+ getRegistrationSh(MY_PRODUCT_NAME)
#5/16/05 wregglej 159437 - moving stuff that messes with the allowed-action dir to after registration
if options.allow_config_actions:
10 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.10.50-1'
by Grant Gainey
Tag 'spacewalk-schema-1.10.50-1' created by Grant Gainey <ggainey(a)redhat.com> at 2013-06-25 13:41 +0000
Tagging package [spacewalk-schema] version [1.10.50-1] in directory [schema/spacewalk/].
Changes since spacewalk-backend-1.10.50-1:
Grant Gainey (1):
Automatic commit of package [spacewalk-schema] release [1.10.50-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 13 ++++++++++++-
2 files changed, 13 insertions(+), 2 deletions(-)
---
10 years, 10 months