[openshift-origin-cartridge-abstract] update to latest release
tdawson
tdawson at fedoraproject.org
Tue Mar 12 19:52:29 UTC 2013
commit c7a7611fc6aa41df0185ac9ad1279762d5d80dce
Author: Troy Dawson <tdawson at redhat.com>
Date: Tue Mar 12 14:52:24 2013 -0500
update to latest release
.gitignore | 1 +
openshift-origin-cartridge-abstract.spec | 104 +++++++++++++++++++++++-------
sources | 2 +-
3 files changed, 82 insertions(+), 25 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0e27154..4baf99f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/openshift-origin-cartridge-abstract-1.2.8.tar.gz
/openshift-origin-cartridge-abstract-1.3.7.tar.gz
/openshift-origin-cartridge-abstract-1.4.4.tar.gz
+/openshift-origin-cartridge-abstract-1.5.9.tar.gz
diff --git a/openshift-origin-cartridge-abstract.spec b/openshift-origin-cartridge-abstract.spec
index f9a2401..521b267 100644
--- a/openshift-origin-cartridge-abstract.spec
+++ b/openshift-origin-cartridge-abstract.spec
@@ -1,35 +1,32 @@
%define cartdir %{_libexecdir}/openshift/cartridges
-Summary: OpenShift common cartridge components
-Name: openshift-origin-cartridge-abstract
-Version: 1.4.4
-Release: 1%{?dist}
-Group: Network/Daemons
-License: ASL 2.0
-URL: http://openshift.redhat.com
-Source0: http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
-BuildArch: noarch
-
-Requires: facter
-Requires: git
-Requires: make
-Requires: mod_ssl
+Summary: OpenShift common cartridge components
+Name: openshift-origin-cartridge-abstract
+Version: 1.5.9
+Release: 1%{?dist}
+Group: Network/Daemons
+License: ASL 2.0
+URL: http://openshift.redhat.com
+Source0: http://mirror.openshift.com/pub/openshift-origin/source/%{name}/%{name}-%{version}.tar.gz
+Requires: facter
+Requires: git
+Requires: make
+Requires: mod_ssl
# abstract/info/connection-hooks/publish-http-url
-Requires: python
+Requires: python
# abstract/info/bin/jenkins_build
-Requires: ruby
-Requires: rubygems
-Requires: rubygem(json)
+Requires: %{?scl:%scl_prefix}ruby
+Requires: %{?scl:%scl_prefix}rubygems
+Requires: %{?scl:%scl_prefix}rubygem(json)
# abstract/info/bin/open_ports.sh
-Requires: socat
+Requires: socat
# abstract/info/bin/nurture_app_push.sh
-Requires: curl
+Requires: curl
# abstract/info/bin/sync_gears.sh
-Requires: rsync
+Requires: rsync
# abstract/info/lib/network
-Requires: lsof
-
-Obsoletes: stickshift-abstract
+Requires: lsof
+BuildArch: noarch
%description
This contains the common function used while building cartridges.
@@ -76,6 +73,8 @@ rm -f %{buildroot}%{cartdir}/abstract-jboss/info/data/mysql.tar
%attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/bin/
%attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/lib/
%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/connection-hooks/
+%dir %attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/configuration/
+%attr(0644,-,-) %{_libexecdir}/openshift/cartridges/abstract/info/configuration/health.html
%files jboss
%doc COPYRIGHT LICENSE
@@ -85,8 +84,65 @@ rm -f %{buildroot}%{cartdir}/abstract-jboss/info/data/mysql.tar
%attr(0755,-,-) %{_libexecdir}/openshift/cartridges/abstract-jboss/info/bin/
%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract-jboss/info/connection-hooks/
%attr(0750,-,-) %{_libexecdir}/openshift/cartridges/abstract-jboss/info/data/
+%doc %{_libexecdir}/openshift/cartridges/abstract-jboss/README.md
%changelog
+* Wed Mar 06 2013 Adam Miller <admiller at redhat.com> 1.5.9-1
+- Merge pull request #1557 from bdecoste/master
+ (dmcphers+openshiftbot at redhat.com)
+- Enable management console (bdecoste at gmail.com)
+
+* Tue Mar 05 2013 Adam Miller <admiller at redhat.com> 1.5.8-1
+- JBoss cartridge documentation for OSE 1.1 (calfonso at redhat.com)
+
+* Fri Mar 01 2013 Adam Miller <admiller at redhat.com> 1.5.7-1
+- BZ916791: Fix invalid args passed to ps. (mrunalp at gmail.com)
+- Merge pull request #1503 from rmillner/US3143
+ (dmcphers+openshiftbot at redhat.com)
+- Was using the wrong call. (rmillner at redhat.com)
+- Bug 916829 - add health url. (rmillner at redhat.com)
+
+* Thu Feb 28 2013 Adam Miller <admiller at redhat.com> 1.5.6-1
+- Merge pull request #1474 from bdecoste/master (dmcphers at redhat.com)
+- Bug 913217 (bdecoste at gmail.com)
+
+* Wed Feb 27 2013 Adam Miller <admiller at redhat.com> 1.5.5-1
+- Merge pull request #1454 from bdecoste/master
+ (dmcphers+openshiftbot at redhat.com)
+- Bug 895507 (bdecoste at gmail.com)
+
+* Mon Feb 25 2013 Adam Miller <admiller at redhat.com> 1.5.4-2
+- bump Release for fixed build target rebuild (admiller at redhat.com)
+
+* Mon Feb 25 2013 Adam Miller <admiller at redhat.com> 1.5.4-1
+- Bug 913288 - Numeric login effected additional commands (jhonce at redhat.com)
+
+* Tue Feb 19 2013 Adam Miller <admiller at redhat.com> 1.5.3-1
+- Audit of remaining front-end Apache touch points. (rmillner at redhat.com)
+- Switch from VirtualHosts to mod_rewrite based routing to support high
+ density. (rmillner at redhat.com)
+- Bug 906740 - Update error message (jhonce at redhat.com)
+- Fixes for ruby193 (john at ibiblio.org)
+- remove community pod (dmcphers at redhat.com)
+- remove use of filesystem cgroup countrol (mlamouri at redhat.com)
+
+* Fri Feb 08 2013 Adam Miller <admiller at redhat.com> 1.5.2-1
+- change %%define to %%global (tdawson at redhat.com)
+
+* Thu Feb 07 2013 Adam Miller <admiller at redhat.com> 1.5.1-1
+- Merge pull request #1334 from kraman/f18_fixes
+ (dmcphers+openshiftbot at redhat.com)
+- Reading hostname from node.conf file instead of relying on localhost
+ Splitting test features into common, rhel only and fedora only sections
+ (kraman at gmail.com)
+- bump_minor_versions for sprint 24 (admiller at redhat.com)
+- Fixing init-quota to allow for tabs in fstab file Added entries in abstract
+ for php-5.4, perl-5.16 Updated python-2.6,php-5.3,perl-5.10 cart so that it
+ wont build on F18 Fixed mongo broker auth Relaxed version requirements for
+ acegi-security and commons-codec when generating hashed password for jenkins
+ Added Apache 2.4 configs for console on F18 Added httpd 2.4 specific restart
+ helper (kraman at gmail.com)
+
* Wed Feb 06 2013 Adam Miller <admiller at redhat.com> 1.4.4-1
- remove BuildRoot: (tdawson at redhat.com)
- make Source line uniform among all spec files (tdawson at redhat.com)
diff --git a/sources b/sources
index b99cbb5..5666822 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4eb0268ec899efe010724cb8d2cb7787 openshift-origin-cartridge-abstract-1.4.4.tar.gz
+016af49e86b6dacc3556557fcf8e89ca openshift-origin-cartridge-abstract-1.5.9.tar.gz
More information about the scm-commits
mailing list