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 1ad6c13303b1caa9de937ed9e66f2b493565034d
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Thu Jun 27 16:25:22 2013 -0400
Automatic commit of package [spacewalk-java] release [1.10.108-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9bfff93..2ab19c7 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.107
+Version: 1.10.108
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
+* Thu Jun 27 2013 Grant Gainey 1.10.108-1
+- 977878 - Clean up maps on local-org-removal
+
* Thu Jun 27 2013 Jan Dobes 1.10.107-1
- 514223 - catching invalid ip to prevent ISE
- removing @Override annotation from methods that aren't overriden
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index a6e2068..9e0f0fe 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.107-1 java/
+1.10.108-1 java/
10 years, 9 months
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/domain/iss/IssFactory.java | 16 +++++++++++
java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.hbm.xml | 6 ++++
java/code/src/com/redhat/rhn/domain/org/OrgFactory.java | 3 ++
3 files changed, 25 insertions(+)
New commits:
commit 5bf4cfe5818cc072bd4a326e249ac1a5238422e3
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Thu Jun 27 16:16:27 2013 -0400
977878 Clean up maps on local-org-removal
diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java b/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java
index c7beeb4..d9ffd40 100644
--- a/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/iss/IssFactory.java
@@ -22,6 +22,7 @@ import java.util.Map;
import org.apache.log4j.Logger;
import com.redhat.rhn.common.hibernate.HibernateFactory;
+import com.redhat.rhn.domain.org.Org;
/**
* IssSlaveFactory - the singleton class used to fetch and store
@@ -117,6 +118,21 @@ public class IssFactory extends HibernateFactory {
"IssMaster.lookupAll", params);
}
+ /**
+ * IssMasterOrg helpers
+ */
+
+ /**
+ * Remove a given local-org from being mapped to any master-orgs
+ * @param inOrg the local-org we want to unmap
+ */
+ public static void unmapLocalOrg(Org inOrg) {
+ HibernateFactory.getSession().
+ getNamedQuery("IssMasterOrg.unmapLocalOrg").
+ setEntity("inOrg", inOrg).
+ executeUpdate();
+ }
+
/***
* Common helpers
***/
diff --git a/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.hbm.xml b/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.hbm.xml
index 0a68bec..f5c3f87 100644
--- a/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.hbm.xml
+++ b/java/code/src/com/redhat/rhn/domain/iss/IssMasterOrg.hbm.xml
@@ -22,4 +22,10 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
column="LOCAL_ORG_ID" class="com.redhat.rhn.domain.org.Org"
/>
</class>
+
+ <query name="IssMasterOrg.unmapLocalOrg">
+ <![CDATA[update com.redhat.rhn.domain.iss.IssMasterOrg mo
+ set mo.localOrg = null where mo.localOrg = :inOrg]]>
+ </query>
+
</hibernate-mapping>
diff --git a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
index 1af1752..8d64a0d 100644
--- a/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/org/OrgFactory.java
@@ -21,6 +21,7 @@ import com.redhat.rhn.common.db.datasource.ModeFactory;
import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.common.hibernate.HibernateFactory;
import com.redhat.rhn.domain.channel.ChannelFamily;
+import com.redhat.rhn.domain.iss.IssFactory;
import com.redhat.rhn.domain.kickstart.KickstartData;
import com.redhat.rhn.domain.kickstart.KickstartFactory;
import com.redhat.rhn.domain.role.RoleFactory;
@@ -95,6 +96,8 @@ public class OrgFactory extends HibernateFactory {
}
}
+ IssFactory.unmapLocalOrg(org);
+
Map<String, Object> in = new HashMap<String, Object>();
in.put("org_id", oid);
CallableMode m = ModeFactory.getCallableMode(
10 years, 9 months
Changes to 'refs/tags/spacewalk-backend-1.10.52-1'
by StephenHerr
Tag 'spacewalk-backend-1.10.52-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-06-27 19:19 +0000
Tagging package [spacewalk-backend] version [1.10.52-1] in directory [backend/].
Changes since spacewalk-proxy-installer-1.10.7-1:
Stephen Herr (2):
977878 - trust syncing should remove trusts that no longer exist
Automatic commit of package [spacewalk-backend] release [1.10.52-1].
---
backend/satellite_tools/sync_handlers.py | 2 +
backend/server/importlib/backend.py | 33 ++++++++++++++++++++++++++++++
backend/server/importlib/channelImport.py | 9 ++++++--
backend/server/importlib/orgImport.py | 33 +++++++++++++++++-------------
backend/spacewalk-backend.spec | 5 +++-
rel-eng/packages/spacewalk-backend | 2 -
6 files changed, 66 insertions(+), 18 deletions(-)
---
10 years, 9 months
2 commits - backend/satellite_tools backend/server backend/spacewalk-backend.spec rel-eng/packages
by StephenHerr
backend/satellite_tools/sync_handlers.py | 2 +
backend/server/importlib/backend.py | 33 ++++++++++++++++++++++++++++++
backend/server/importlib/channelImport.py | 9 ++++++--
backend/server/importlib/orgImport.py | 33 +++++++++++++++++-------------
backend/spacewalk-backend.spec | 5 +++-
rel-eng/packages/spacewalk-backend | 2 -
6 files changed, 66 insertions(+), 18 deletions(-)
New commits:
commit 749defd841d2cf9f9731ea5b3376872e6df410c0
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jun 27 15:19:30 2013 -0400
Automatic commit of package [spacewalk-backend] release [1.10.52-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 5132abe..d1218b5 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.51
+Version: 1.10.52
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
+* Thu Jun 27 2013 Stephen Herr <sherr(a)redhat.com> 1.10.52-1
+- 977878 - trust syncing should remove trusts that no longer exist
+
* Tue Jun 25 2013 Stephen Herr <sherr(a)redhat.com> 1.10.51-1
- 977878 - fixing checkstyle errors
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index c17f862..10e625c 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.51-1 backend/
+1.10.52-1 backend/
commit b8290655ca8d89093555012728cd6f46211d3281
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Jun 27 15:18:43 2013 -0400
977878 - trust syncing should remove trusts that no longer exist
diff --git a/backend/satellite_tools/sync_handlers.py b/backend/satellite_tools/sync_handlers.py
index 974ffc9..66e7370 100644
--- a/backend/satellite_tools/sync_handlers.py
+++ b/backend/satellite_tools/sync_handlers.py
@@ -223,6 +223,8 @@ def import_channels(channels, orgid=None, master=None):
c_obj['org_id'] = org_map[c_obj['org_id']]
else:
c_obj['org_id'] = orgid
+ if c_obj.has_key('trust_list'):
+ del(c_obj['trust_list'])
for family in c_obj['families']:
family['label'] = 'private-channel-family-' + \
str(c_obj['org_id'])
diff --git a/backend/server/importlib/backend.py b/backend/server/importlib/backend.py
index fc73cde..5491517 100644
--- a/backend/server/importlib/backend.py
+++ b/backend/server/importlib/backend.py
@@ -360,6 +360,17 @@ class Backend:
ret[row['org_id']].append(row['org_trust_id'])
return ret
+ def clearOrgTrusts(self, org_id):
+ # Delete all trusts involving this org; trusts are always
+ # bi-directional
+ sql = """
+ delete from rhnTrustedOrgs
+ where org_id = :org_id
+ or org_trust_id = :org_id
+ """
+ h = self.dbmodule.prepare(sql)
+ h.execute(org_id=org_id)
+
def createOrgTrusts(self, trusts):
# Create org trusts
insert = [[],[]]
@@ -926,6 +937,28 @@ class Backend:
self.__processObjectCollection(channels, 'rhnChannel', childTables,
'channel_id', uploadForce=4, ignoreUploaded=1, forceVerify=1)
+ def orgTrustExists(self, org_id, trust_id):
+ sql = """
+ select *
+ from rhnTrustedOrgs
+ where org_id = :org_id
+ and org_trust_id = :trust_id
+ """
+ h = self.dbmodule.prepare(sql)
+ h.execute(org_id=org_id, trust_id=trust_id)
+ row = h.fetchone_dict()
+ if row:
+ return True
+ return False
+
+ def clearChannelTrusts(self, label):
+ sql = """
+ delete from rhnChannelTrust where channel_id =
+ (select id from rhnChannel where label = :label)
+ """
+ h = self.dbmodule.prepare(sql)
+ h.execute(label=label)
+
def processChannelTrusts(self, channel_trusts):
# Create channel trusts
insert = [[],[]]
diff --git a/backend/server/importlib/channelImport.py b/backend/server/importlib/channelImport.py
index cd2fccc..cd95b57 100644
--- a/backend/server/importlib/channelImport.py
+++ b/backend/server/importlib/channelImport.py
@@ -135,9 +135,14 @@ class ChannelImport(Import):
continue
if (channel.has_key('trust_list')
and channel['trust_list']):
+ self.backend.clearChannelTrusts(channel['label'])
for trust in channel['trust_list']:
- channel_trusts.append({'channel-label': channel['label'],
- 'org-id': trust['org_trust_id']})
+ if (channel.has_key('org_id') and channel['org_id']
+ and self.backend.orgTrustExists(
+ channel['org_id'], trust['org_trust_id'])):
+ channel_trusts.append(
+ {'channel-label': channel['label'],
+ 'org-id': trust['org_trust_id']})
parent = channel['parent_channel']
if not parent:
nullParentBatch.append(channel)
diff --git a/backend/server/importlib/orgImport.py b/backend/server/importlib/orgImport.py
index da0b807..b612da6 100644
--- a/backend/server/importlib/orgImport.py
+++ b/backend/server/importlib/orgImport.py
@@ -18,9 +18,15 @@
from importLib import Import
-# Here is how this is supposed to work:
-# 1) Satellite sync creates a bunch of importLib.Org objects.
-# All ids are master ids.
+# Thanks for this class goes to Alex Martelli:
+# http://stackoverflow.com/questions/1151658/python-hashable-dicts
+class hashabledict(dict):
+ def __key(self):
+ return tuple((k,self[k]) for k in sorted(self))
+ def __hash__(self):
+ return hash(self.__key())
+ def __eq__(self, other):
+ return self.__key() == other.__key()
class OrgImport(Import):
def __init__(self, batch, backend, master_label, create_orgs=False):
@@ -83,26 +89,25 @@ class OrgImport(Import):
# Iff we have a master org mapped to local org, create org
# trust records
- existing_trusts = self.backend.lookupOrgTrusts()
- trusts_to_create = []
# we need to uniquify in case user has mapped multiple orgs
# together
- hashes = set([])
+ trusts_to_create = set([])
for org in self.batch:
for trust in org['org_trust_ids']:
if (org['id'] in self.mi_to_li.keys()
and trust['org_id'] in self.mi_to_li.keys()):
my_org_id = self.mi_to_li[org['id']]
+ self.backend.clearOrgTrusts(my_org_id)
my_trust_id = self.mi_to_li[trust['org_id']]
- _hash = (str(self.mi_to_li[org['id']]) +
- str(self.mi_to_li[trust['org_id']]))
- if (_hash not in hashes
- and not (my_org_id in existing_trusts.keys()
- and my_trust_id in existing_trusts[my_org_id])):
- trusts_to_create.append({
+ trusts_to_create.add(hashabledict({
'org_id': my_org_id,
- 'trust': my_trust_id})
- hashes.add(_hash)
+ 'trust': my_trust_id}))
+ # org trusts are always bi-directional
+ # (even if we are not syncing the other org)
+ trusts_to_create.add(hashabledict({
+ 'org_id': my_trust_id,
+ 'trust': my_org_id}))
+
if len(trusts_to_create) > 0:
self.backend.createOrgTrusts(trusts_to_create)
except:
10 years, 9 months
Changes to 'refs/tags/spacewalk-proxy-installer-1.10.7-1'
by Dimitar Yordanov
Tag 'spacewalk-proxy-installer-1.10.7-1' created by Dimitar Yordanov <dyordano(a)redhat.com> at 2013-06-27 18:05 +0000
Tagging package [spacewalk-proxy-installer] version [1.10.7-1] in directory [proxy/installer/].
Changes since spacewalk-proxy-installer-1.10.6-1:
Dimitar Yordanov (3):
Revert "979038 - Obtain default options from up2date"
979038 - Obtain default options from up2date
Automatic commit of package [spacewalk-proxy-installer] release [1.10.7-1].
---
proxy/installer/rhn_proxy_activate.py | 11 ++++++++---
proxy/installer/spacewalk-proxy-installer.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
3 files changed, 14 insertions(+), 5 deletions(-)
---
10 years, 9 months
proxy/installer rel-eng/packages
by Dimitar Yordanov
proxy/installer/spacewalk-proxy-installer.spec | 6 +++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 9ff342f31b2bf6d49f6381d7ad207bd9d7bfede0
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Thu Jun 27 20:05:17 2013 +0200
Automatic commit of package [spacewalk-proxy-installer] release [1.10.7-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index 5001dd7..2b9a765 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
Group: Applications/Internet
License: GPLv2
-Version: 1.10.6
+Version: 1.10.7
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -96,6 +96,10 @@ spacewalk-pylint $RPM_BUILD_ROOT/usr/share/rhn
%doc LICENSE answers.txt
%changelog
+* Thu Jun 27 2013 Dimitar Yordanov <dyordano(a)redhat.com> 1.10.7-1
+- 979038 - Obtain default options from up2date
+- Revert "979038 - Obtain default options from up2date"
+
* Thu Jun 27 2013 Dimitar Yordanov <dyordano(a)redhat.com> 1.10.6-1
- 979038 - Obtain default options from up2date
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer
index f461bee..9a36378 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.10.6-1 proxy/installer/
+1.10.7-1 proxy/installer/
10 years, 9 months
proxy/installer
by Dimitar Yordanov
proxy/installer/rhn_proxy_activate.py | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
New commits:
commit cf21be2d7b0af320f8b53a9989124a4a00e5692e
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Thu Jun 27 19:59:43 2013 +0200
979038 - Obtain default options from up2date
diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_proxy_activate.py
index e4ec562..eaca684 100644
--- a/proxy/installer/rhn_proxy_activate.py
+++ b/proxy/installer/rhn_proxy_activate.py
@@ -33,6 +33,9 @@ import xmlrpclib
from rhn import rpclib, SSL
from optparse import Option, OptionParser
+sys.path.append('/usr/share/rhn')
+from up2date_client import config
+
DEFAULT_WEBRPC_HANDLER_v3_x = '/rpc/api'
def getSystemId():
@@ -402,11 +405,19 @@ def listAvailableProxyChannels(options):
sys.stdout.write("\n".join(channel_list)+"\n")
def processCommandline():
- # FIXME: we should populate this keys from /etc/sysconfig/rhn/up2date
- rhn_parent = ''
- httpProxy = ''
- httpProxyUsername = ''
- httpProxyPassword = ''
+
+ cfg = config.initUp2dateConfig()
+ up2date_cfg = dict(cfg.items())
+
+ if type(up2date_cfg['serverURL']) is type([]):
+ rhn_parent = urlparse.urlparse(up2date_cfg['serverURL'][0])[1]
+ else:
+ rhn_parent = urlparse.urlparse(up2date_cfg['serverURL'])[1]
+
+ httpProxy = urlparse.urlparse(up2date_cfg['httpProxy'])[1]
+ httpProxyUsername = up2date_cfg['proxyUser']
+ httpProxyPassword = up2date_cfg['proxyPassword']
+
if not httpProxy:
httpProxyUsername, httpProxyPassword = '', ''
if not httpProxyUsername:
@@ -423,7 +434,7 @@ def processCommandline():
Option('--http-proxy-username', action='store', default=httpProxyUsername,
help="alternative HTTP proxy usename, default is %s" % repr(httpProxyUsername)),
Option('--http-proxy-password', action='store', default=httpProxyPassword,
- help="alternative HTTP proxy password, default is %s" % repr(httpProxyUsername)),
+ help="alternative HTTP proxy password, default is %s" % repr(httpProxyPassword)),
Option('--ca-cert', action='store', default=ca_cert,
help="alternative SSL certificate to use, default is %s" % repr(ca_cert)),
Option('--no-ssl', action='store_true',
10 years, 9 months
proxy/installer
by Dimitar Yordanov
proxy/installer/rhn_proxy_activate.py | 20 +++++++-------------
1 file changed, 7 insertions(+), 13 deletions(-)
New commits:
commit 3069da928e56d7a3fca644d5c6226fd30fc5b1f0
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Thu Jun 27 19:14:10 2013 +0200
Revert "979038 - Obtain default options from up2date"
This reverts commit 7da0f03883e9b8e2d9b74304ac987981028c6e27.
diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_proxy_activate.py
index 37597cd..e4ec562 100644
--- a/proxy/installer/rhn_proxy_activate.py
+++ b/proxy/installer/rhn_proxy_activate.py
@@ -33,9 +33,6 @@ import xmlrpclib
from rhn import rpclib, SSL
from optparse import Option, OptionParser
-sys.path.append('/usr/share/rhn')
-from up2date_client import config
-
DEFAULT_WEBRPC_HANDLER_v3_x = '/rpc/api'
def getSystemId():
@@ -405,19 +402,16 @@ def listAvailableProxyChannels(options):
sys.stdout.write("\n".join(channel_list)+"\n")
def processCommandline():
-
- cfg = config.initUp2dateConfig()
- up2date_cfg = dict(cfg.items())
-
- rhn_parent = urlparse.urlparse(up2date_cfg['serverURL'][0])[1]
- httpProxy = urlparse.urlparse(up2date_cfg['httpProxy'][0])[1]
- httpProxyUsername = up2date_cfg['proxyUser']
- httpProxyPassword = up2date_cfg['proxyPassword']
+ # FIXME: we should populate this keys from /etc/sysconfig/rhn/up2date
+ rhn_parent = ''
+ httpProxy = ''
+ httpProxyUsername = ''
+ httpProxyPassword = ''
if not httpProxy:
httpProxyUsername, httpProxyPassword = '', ''
if not httpProxyUsername:
httpProxyPassword = ''
- ca_cert = up2date_cfg['sslCACert']
+ ca_cert = ''
defaultVersion = '5.2'
# parse options
@@ -429,7 +423,7 @@ def processCommandline():
Option('--http-proxy-username', action='store', default=httpProxyUsername,
help="alternative HTTP proxy usename, default is %s" % repr(httpProxyUsername)),
Option('--http-proxy-password', action='store', default=httpProxyPassword,
- help="alternative HTTP proxy password, default is %s" % repr(httpProxyPassword)),
+ help="alternative HTTP proxy password, default is %s" % repr(httpProxyUsername)),
Option('--ca-cert', action='store', default=ca_cert,
help="alternative SSL certificate to use, default is %s" % repr(ca_cert)),
Option('--no-ssl', action='store_true',
10 years, 9 months
Changes to 'refs/tags/spacewalk-proxy-installer-1.10.6-1'
by Dimitar Yordanov
Tag 'spacewalk-proxy-installer-1.10.6-1' created by Dimitar Yordanov <dyordano(a)redhat.com> at 2013-06-27 15:47 +0000
Tagging package [spacewalk-proxy-installer] version [1.10.6-1] in directory [proxy/installer/].
Changes since rhn-client-tools-1.10.11-1:
Dimitar Yordanov (2):
979038 - Obtain default options from up2date
Automatic commit of package [spacewalk-proxy-installer] release [1.10.6-1].
Milan Zazrivec (1):
oracle -> pg migrations: filter plan_table_9i out
---
proxy/installer/rhn_proxy_activate.py | 20 +++++++++++++-------
proxy/installer/spacewalk-proxy-installer.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
utils/spacewalk-dump-schema | 2 +-
4 files changed, 19 insertions(+), 10 deletions(-)
---
10 years, 9 months
proxy/installer rel-eng/packages
by Dimitar Yordanov
proxy/installer/spacewalk-proxy-installer.spec | 5 ++++-
rel-eng/packages/spacewalk-proxy-installer | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 155abeb00acc2c9608c7ccaa010d0cc68c1d81d4
Author: Dimitar Yordanov <dyordano(a)redhat.com>
Date: Thu Jun 27 17:47:07 2013 +0200
Automatic commit of package [spacewalk-proxy-installer] release [1.10.6-1].
diff --git a/proxy/installer/spacewalk-proxy-installer.spec b/proxy/installer/spacewalk-proxy-installer.spec
index 43657c9..5001dd7 100644
--- a/proxy/installer/spacewalk-proxy-installer.spec
+++ b/proxy/installer/spacewalk-proxy-installer.spec
@@ -2,7 +2,7 @@ Name: spacewalk-proxy-installer
Summary: Spacewalk Proxy Server Installer
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
@@ -96,6 +96,9 @@ spacewalk-pylint $RPM_BUILD_ROOT/usr/share/rhn
%doc LICENSE answers.txt
%changelog
+* Thu Jun 27 2013 Dimitar Yordanov <dyordano(a)redhat.com> 1.10.6-1
+- 979038 - Obtain default options from up2date
+
* Mon Jun 17 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.5-1
- removed old CVS/SVN version ids
- branding fixes in man pages
diff --git a/rel-eng/packages/spacewalk-proxy-installer b/rel-eng/packages/spacewalk-proxy-installer
index 9be54a9..f461bee 100644
--- a/rel-eng/packages/spacewalk-proxy-installer
+++ b/rel-eng/packages/spacewalk-proxy-installer
@@ -1 +1 @@
-1.10.5-1 proxy/installer/
+1.10.6-1 proxy/installer/
10 years, 9 months